From 36d5ae1580a52630fdcf372c6f55a51b4da6535c Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 17 Mar 2020 00:19:56 -0700 Subject: 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 Signed-off-by: Khem Raj --- .../0001-waf-add-support-of-cross_compile.patch | 63 ---------------------- .../tdb-Add-configure-options-for-packages.patch | 2 +- .../recipes-support/libtdb/libtdb_1.4.2.bb | 57 -------------------- .../recipes-support/libtdb/libtdb_1.4.3.bb | 56 +++++++++++++++++++ 4 files changed, 57 insertions(+), 121 deletions(-) delete mode 100644 meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch delete mode 100644 meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb create mode 100644 meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb (limited to 'meta-networking/recipes-support') diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index e20c9a2c24..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li -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 ---- - 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 - diff --git a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch index 481fd68a4f..c35cab7c2f 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch @@ -78,7 +78,7 @@ index 1d01e1e..2336dc3 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') diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb deleted file mode 100644 index 4973e80ca2..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "The tdb library" -HOMEPAGE = "http://tdb.samba.org/" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ - file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" - -SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://tdb-Add-configure-options-for-packages.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" - -SRC_URI[md5sum] = "b2c05ad68334368d3258a63db709f254" -SRC_URI[sha256sum] = "9040b2cce4028e392f063f91bbe76b8b28fecc2b7c0c6071c67b5eb3168e004a" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" - -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -S = "${WORKDIR}/tdb-${PV}" - -inherit waf-samba - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -do_install_append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so -} - -PACKAGES += "tdb-tools python3-tdb" - -RPROVIDES_${PN}-dbg += "python3-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -RDEPENDS_python3-tdb = "python3" -INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb new file mode 100644 index 0000000000..c131014ff4 --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb @@ -0,0 +1,56 @@ +SUMMARY = "The tdb library" +HOMEPAGE = "http://tdb.samba.org/" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" + +LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ + file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" + +SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ + file://tdb-Add-configure-options-for-packages.patch \ +" + +SRC_URI[md5sum] = "e638e8890f743624a754304b3f994f4d" +SRC_URI[sha256sum] = "c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +S = "${WORKDIR}/tdb-${PV}" + +inherit waf-samba + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +do_install_append() { + # add this link for cross check python module existence. eg: on x86-64 host, check python module + # under recipe-sysroot which is mips64. + cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so +} + +PACKAGES += "tdb-tools python3-tdb" + +RPROVIDES_${PN}-dbg += "python3-tdb-dbg" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_tdb-tools = "${bindir}/*" +FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +RDEPENDS_python3-tdb = "python3" +INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" -- cgit v1.2.3-54-g00ecf