mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
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
Khem Raj
-62
@@ -1,62 +0,0 @@
|
||||
From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Fri, 25 Jan 2019 15:00:59 +0800
|
||||
Subject: [PATCH] waf: add support of cross_compile
|
||||
|
||||
After upgrade, waf also upgraded
|
||||
|
||||
on 1.5.19, for cross_compile, subprocess.Popen is set to be
|
||||
samba_cross.cross_Popen, which will not execute testprog on
|
||||
host, but only read result from cross-answers.txt which is
|
||||
passed by option --cross-answer
|
||||
|
||||
part of old code:
|
||||
args = Utils.to_list(kw.get('exec_args', []))
|
||||
proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE)
|
||||
|
||||
but on new version, exec_args is not used and cause do_configure
|
||||
failed with Exec format error
|
||||
|
||||
fixed by append cross anser related args to cmd
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211]
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
third_party/waf/waflib/Tools/c_config.py | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py
|
||||
index 7608215..767cf33 100644
|
||||
--- a/third_party/waf/waflib/Tools/c_config.py
|
||||
+++ b/third_party/waf/waflib/Tools/c_config.py
|
||||
@@ -660,20 +660,21 @@ class test_exec(Task.Task):
|
||||
"""
|
||||
color = 'PINK'
|
||||
def run(self):
|
||||
+ args = self.generator.bld.kw.get('exec_args', [])
|
||||
if getattr(self.generator, 'rpath', None):
|
||||
if getattr(self.generator, 'define_ret', False):
|
||||
- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()])
|
||||
- else:
|
||||
- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()])
|
||||
+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args)
|
||||
+ else:
|
||||
+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args)
|
||||
else:
|
||||
env = self.env.env or {}
|
||||
env.update(dict(os.environ))
|
||||
for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'):
|
||||
env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '')
|
||||
if getattr(self.generator, 'define_ret', False):
|
||||
- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env)
|
||||
+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env)
|
||||
else:
|
||||
- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env)
|
||||
+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env)
|
||||
|
||||
@feature('test_exec')
|
||||
@after_method('apply_link')
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/lib/replace/wscript 2015-11-13 16:04:04.000000000 +0100
|
||||
+++ b/lib/replace/wscript 2015-11-13 16:23:20.000000000 +0100
|
||||
@@ -837,8 +837,6 @@ def build(bld):
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -947,8 +947,6 @@ def build(bld):
|
||||
if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c'
|
||||
if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c'
|
||||
if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c'
|
||||
@@ -9,12 +9,13 @@
|
||||
|
||||
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
|
||||
REPLACE_SOURCE += ' closefrom.c'
|
||||
@@ -852,7 +850,7 @@ def build(bld):
|
||||
@@ -962,7 +960,7 @@ def build(bld):
|
||||
# at the moment:
|
||||
# hide_symbols=bld.BUILTIN_LIBRARY('replace'),
|
||||
private_library=True,
|
||||
- deps='crypt dl nsl socket rt attr' + extra_libs)
|
||||
+ deps='crypt dl nsl socket rt ' + extra_libs)
|
||||
- deps='dl attr' + extra_libs)
|
||||
+ deps='dl' + extra_libs)
|
||||
|
||||
replace_test_cflags="-Wno-format-zero-length"
|
||||
replace_test_cflags = ''
|
||||
if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
+2
-3
@@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
|
||||
|
||||
SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
|
||||
file://options-2.2.0.patch \
|
||||
file://0001-waf-add-support-of-cross_compile.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "8416b153547add81cd1a4d24e598c890"
|
||||
SRC_URI[sha256sum] = "75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6"
|
||||
SRC_URI[md5sum] = "ce40593428c0de6b85946189dcc37b5e"
|
||||
SRC_URI[sha256sum] = "ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77"
|
||||
|
||||
inherit waf-samba
|
||||
|
||||
Reference in New Issue
Block a user