diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-07-02 09:58:10 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:24:32 -0700 |
commit | 6613c053c52f18282e8704923a5f6d3cd2b3e75c (patch) | |
tree | 8ca0a706c81a56f127e2657b6f34ef351af337bf /meta-networking/recipes-support/libtalloc/libtalloc | |
parent | 6e5e1505cc83ae27221b9f77489e3e01f09d58ab (diff) | |
download | meta-openembedded-6613c053c52f18282e8704923a5f6d3cd2b3e75c.tar.gz |
libtalloc: upgrade 2.1.14 -> 2.2.0
1. switch to python3
2. fix cross-compile prolem caused by waf
3. refresh patch
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/libtalloc/libtalloc')
-rw-r--r-- | meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch | 62 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch (renamed from meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.14.patch) | 47 |
2 files changed, 86 insertions, 23 deletions
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch new file mode 100644 index 000000000..e58339afb --- /dev/null +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Fri, 25 Jan 2019 15:00:59 +0800 | ||
4 | Subject: [PATCH] waf: add support of cross_compile | ||
5 | |||
6 | After upgrade, waf also upgraded | ||
7 | |||
8 | on 1.5.19, for cross_compile, subprocess.Popen is set to be | ||
9 | samba_cross.cross_Popen, which will not execute testprog on | ||
10 | host, but only read result from cross-answers.txt which is | ||
11 | passed by option --cross-answer | ||
12 | |||
13 | part of old code: | ||
14 | args = Utils.to_list(kw.get('exec_args', [])) | ||
15 | proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) | ||
16 | |||
17 | but on new version, exec_args is not used and cause do_configure | ||
18 | failed with Exec format error | ||
19 | |||
20 | fixed by append cross anser related args to cmd | ||
21 | |||
22 | Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] | ||
23 | |||
24 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
25 | --- | ||
26 | third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- | ||
27 | 1 file changed, 6 insertions(+), 5 deletions(-) | ||
28 | |||
29 | diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py | ||
30 | index 7608215..767cf33 100644 | ||
31 | --- a/third_party/waf/waflib/Tools/c_config.py | ||
32 | +++ b/third_party/waf/waflib/Tools/c_config.py | ||
33 | @@ -660,20 +660,21 @@ class test_exec(Task.Task): | ||
34 | """ | ||
35 | color = 'PINK' | ||
36 | def run(self): | ||
37 | + args = self.generator.bld.kw.get('exec_args', []) | ||
38 | if getattr(self.generator, 'rpath', None): | ||
39 | if getattr(self.generator, 'define_ret', False): | ||
40 | - self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) | ||
41 | - else: | ||
42 | - self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) | ||
43 | + self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) | ||
44 | + else: | ||
45 | + self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) | ||
46 | else: | ||
47 | env = self.env.env or {} | ||
48 | env.update(dict(os.environ)) | ||
49 | for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): | ||
50 | env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') | ||
51 | if getattr(self.generator, 'define_ret', False): | ||
52 | - self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) | ||
53 | + self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) | ||
54 | else: | ||
55 | - self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) | ||
56 | + self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) | ||
57 | |||
58 | @feature('test_exec') | ||
59 | @after_method('apply_link') | ||
60 | -- | ||
61 | 2.7.4 | ||
62 | |||
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.14.patch b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch index df45d36e9..3847b013e 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.14.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 319a2a1bb46ae35fa9d66878cb08285035f0bd5f Mon Sep 17 00:00:00 2001 | 1 | From c6d76c8ade57b996a8123b1c1a3a28ba4666e9c6 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 19 Jul 2018 15:41:31 +0800 | 3 | Date: Thu, 20 Jun 2019 10:57:06 +0800 |
4 | Subject: [PATCH] talloc: Add configure options for packages | 4 | Subject: [PATCH] talloc: Add configure options for packages |
5 | 5 | ||
6 | Add configure options for the following packages: | 6 | Add configure options for the following packages: |
@@ -19,22 +19,21 @@ Modified to apply to version 2.1.10. | |||
19 | 19 | ||
20 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 20 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
21 | 21 | ||
22 | Modified tp apply to version 2.1.14 | 22 | Modified tp apply to version 2.2.0 |
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
24 | --- | 24 | --- |
25 | lib/replace/wscript | 90 +++++++++++++++++++++++++++++++++++++++++------------ | 25 | lib/replace/wscript | 91 ++++++++++++++++++++++++++++++++++++++++------------- |
26 | wscript | 7 +++++ | 26 | wscript | 7 ++++- |
27 | 2 files changed, 77 insertions(+), 20 deletions(-) | 27 | 2 files changed, 76 insertions(+), 22 deletions(-) |
28 | 28 | ||
29 | diff --git a/lib/replace/wscript b/lib/replace/wscript | 29 | diff --git a/lib/replace/wscript b/lib/replace/wscript |
30 | index fd00a42..a77c058 100644 | 30 | index 1d01e1e..7bc7666 100644 |
31 | --- a/lib/replace/wscript | 31 | --- a/lib/replace/wscript |
32 | +++ b/lib/replace/wscript | 32 | +++ b/lib/replace/wscript |
33 | @@ -22,6 +22,41 @@ def set_options(opt): | 33 | @@ -25,6 +25,41 @@ def options(opt): |
34 | opt.BUILTIN_DEFAULT('NONE') | ||
35 | opt.PRIVATE_EXTENSION_DEFAULT('') | 34 | opt.PRIVATE_EXTENSION_DEFAULT('') |
36 | opt.RECURSE('buildtools/wafsamba') | 35 | opt.RECURSE('buildtools/wafsamba') |
37 | + | 36 | |
38 | + opt.add_option('--with-acl', | 37 | + opt.add_option('--with-acl', |
39 | + help=("Enable use of acl"), | 38 | + help=("Enable use of acl"), |
40 | + action="store_true", dest='enable_acl') | 39 | + action="store_true", dest='enable_acl') |
@@ -69,10 +68,11 @@ index fd00a42..a77c058 100644 | |||
69 | + opt.add_option('--without-libcap', | 68 | + opt.add_option('--without-libcap', |
70 | + help=("Disable use of libcap"), | 69 | + help=("Disable use of libcap"), |
71 | + action="store_false", dest='enable_libcap', default=False) | 70 | + action="store_false", dest='enable_libcap', default=False) |
72 | 71 | + | |
73 | @Utils.run_once | 72 | @Utils.run_once |
74 | def configure(conf): | 73 | def configure(conf): |
75 | @@ -32,12 +67,25 @@ def configure(conf): | 74 | conf.RECURSE('buildtools/wafsamba') |
75 | @@ -34,12 +69,25 @@ def configure(conf): | ||
76 | conf.DEFINE('HAVE_LIBREPLACE', 1) | 76 | conf.DEFINE('HAVE_LIBREPLACE', 1) |
77 | conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) | 77 | conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) |
78 | 78 | ||
@@ -101,20 +101,21 @@ index fd00a42..a77c058 100644 | |||
101 | + conf.CHECK_HEADERS('sys/capability.h') | 101 | + conf.CHECK_HEADERS('sys/capability.h') |
102 | + | 102 | + |
103 | conf.CHECK_HEADERS('port.h') | 103 | conf.CHECK_HEADERS('port.h') |
104 | conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') | 104 | conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') |
105 | conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') | 105 | conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') |
106 | @@ -108,7 +156,9 @@ def configure(conf): | 106 | @@ -110,8 +158,9 @@ def configure(conf): |
107 | conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') | 107 | conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') |
108 | conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') | 108 | conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') |
109 | 109 | ||
110 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') | 110 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') |
111 | - conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') | ||
111 | + if Options.options.enable_valgrind: | 112 | + if Options.options.enable_valgrind: |
112 | + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') | 113 | + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') |
113 | + | 114 | + conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') |
114 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 115 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
115 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 116 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
116 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') | 117 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
117 | @@ -342,20 +392,20 @@ def configure(conf): | 118 | @@ -380,20 +429,20 @@ def configure(conf): |
118 | 119 | ||
119 | strlcpy_in_bsd = False | 120 | strlcpy_in_bsd = False |
120 | 121 | ||
@@ -150,23 +151,23 @@ index fd00a42..a77c058 100644 | |||
150 | conf.CHECK_CODE(''' | 151 | conf.CHECK_CODE(''' |
151 | struct ucred cred; | 152 | struct ucred cred; |
152 | diff --git a/wscript b/wscript | 153 | diff --git a/wscript b/wscript |
153 | index 18f726e..fed8ab9 100644 | 154 | index e402069..9976f4c 100644 |
154 | --- a/wscript | 155 | --- a/wscript |
155 | +++ b/wscript | 156 | +++ b/wscript |
156 | @@ -32,6 +32,13 @@ def set_options(opt): | 157 | @@ -31,7 +31,12 @@ def options(opt): |
157 | opt.add_option('--enable-talloc-compat1', | 158 | opt.add_option('--enable-talloc-compat1', |
158 | help=("Build talloc 1.x.x compat library [False]"), | 159 | help=("Build talloc 1.x.x compat library [False]"), |
159 | action="store_true", dest='TALLOC_COMPAT1', default=False) | 160 | action="store_true", dest='TALLOC_COMPAT1', default=False) |
161 | - | ||
160 | + opt.add_option('--with-valgrind', | 162 | + opt.add_option('--with-valgrind', |
161 | + help=("enable use of valgrind"), | 163 | + help=("enable use of valgrind"), |
162 | + action="store_true", dest='enable_valgrind') | 164 | + action="store_true", dest='enable_valgrind') |
163 | + opt.add_option('--without-valgrind', | 165 | + opt.add_option('--without-valgrind', |
164 | + help=("disable use of valgrind"), | 166 | + help=("disable use of valgrind"), |
165 | + action="store_false", dest='enable_valgrind', default=False) | 167 | + action="store_false", dest='enable_valgrind', default=False) |
166 | + | ||
167 | |||
168 | 168 | ||
169 | def configure(conf): | 169 | def configure(conf): |
170 | conf.RECURSE('lib/replace') | ||
170 | -- | 171 | -- |
171 | 2.7.4 | 172 | 2.7.4 |
172 | 173 | ||