libtalloc: upgrade 2.3.0 -> 2.3.1

0001-waf-add-support-of-cross_compile.patch
Removed since this is included in 2.3.1.

Refresh the following patch:
avoid-attr-unless-wanted.patch
options-2.2.0.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
zangrc
2020-12-28 10:16:13 +08:00
committed by Khem Raj
parent f48b66b8ba
commit d8426e0637
4 changed files with 22 additions and 85 deletions

View File

@@ -1,6 +1,6 @@
From c6d76c8ade57b996a8123b1c1a3a28ba4666e9c6 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 20 Jun 2019 10:57:06 +0800
From 8a82056ba2f70137714f225d82993aa4b11042da Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Fri, 25 Dec 2020 14:14:08 +0900
Subject: [PATCH] talloc: Add configure options for packages
Add configure options for the following packages:
@@ -22,12 +22,12 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
Modified tp apply to version 2.2.0
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
lib/replace/wscript | 91 ++++++++++++++++++++++++++++++++++++++++-------------
wscript | 7 ++++-
2 files changed, 76 insertions(+), 22 deletions(-)
lib/replace/wscript | 89 +++++++++++++++++++++++++++++++++++----------
wscript | 7 +++-
2 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 1d01e1e..7bc7666 100644
index a2bc604..2e2e7bf 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -25,6 +25,41 @@ def options(opt):
@@ -81,10 +81,9 @@ index 1d01e1e..7bc7666 100644
+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h')
+ conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h')
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
- conf.CHECK_HEADERS('shadow.h sys/acl.h')
- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
+ conf.CHECK_HEADERS('shadow.h')
+ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h')
+
@@ -103,7 +102,7 @@ index 1d01e1e..7bc7666 100644
conf.CHECK_HEADERS('port.h')
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h')
conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
@@ -110,8 +158,9 @@ def configure(conf):
@@ -121,8 +169,9 @@ def configure(conf):
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
@@ -115,7 +114,7 @@ index 1d01e1e..7bc7666 100644
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
@@ -380,20 +429,20 @@ def configure(conf):
@@ -418,20 +467,20 @@ def configure(conf):
strlcpy_in_bsd = False
@@ -151,7 +150,7 @@ index 1d01e1e..7bc7666 100644
conf.CHECK_CODE('''
struct ucred cred;
diff --git a/wscript b/wscript
index e402069..9976f4c 100644
index b955d21..4ac6e1e 100644
--- a/wscript
+++ b/wscript
@@ -31,7 +31,12 @@ def options(opt):
@@ -169,5 +168,5 @@ index e402069..9976f4c 100644
def configure(conf):
conf.RECURSE('lib/replace')
--
2.7.4
2.25.1