mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
libtdb: upgrade 1.4.2 -> 1.4.3
0001-waf-add-support-of-cross_compile.patch removed since it's not available for 1.4.3 refresh tdb-Add-configure-options-for-packages.patch Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-63
@@ -1,63 +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 libtdb from 1.3.16 to 1.3.17, waf build system
|
|
||||||
which used by libtdb upgrade from 1.5.19 to 2.0.8
|
|
||||||
|
|
||||||
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 2.0.8, 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
-1
@@ -78,7 +78,7 @@ index 1d01e1e..2336dc3 100644
|
|||||||
+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h')
|
+ 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('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('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('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('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('locale.h ndir.h pwd.h')
|
||||||
|
|||||||
+2
-3
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c
|
|||||||
|
|
||||||
SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
|
SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
|
||||||
file://tdb-Add-configure-options-for-packages.patch \
|
file://tdb-Add-configure-options-for-packages.patch \
|
||||||
file://0001-waf-add-support-of-cross_compile.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "b2c05ad68334368d3258a63db709f254"
|
SRC_URI[md5sum] = "e638e8890f743624a754304b3f994f4d"
|
||||||
SRC_URI[sha256sum] = "9040b2cce4028e392f063f91bbe76b8b28fecc2b7c0c6071c67b5eb3168e004a"
|
SRC_URI[sha256sum] = "c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b"
|
||||||
|
|
||||||
PACKAGECONFIG ??= "\
|
PACKAGECONFIG ??= "\
|
||||||
${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
|
${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
|
||||||
Reference in New Issue
Block a user