From 650c226a168ca66ac180f253cda1e6afc0d5a9bc Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 31 Jul 2017 18:03:47 +0800 Subject: libtdb: update 1.3.12 -> 1.3.14 1) Upgrade libtdb from 1.3.12 to 1.3.14. 2) Update tdb-Add-configure-options-for-packages.patch for libtdb_1.3.14. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- .../tdb-Add-configure-options-for-packages.patch | 43 +++++++++++++--------- .../recipes-support/libtdb/libtdb_1.3.12.bb | 43 ---------------------- .../recipes-support/libtdb/libtdb_1.3.14.bb | 43 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 61 deletions(-) delete mode 100644 meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb create mode 100644 meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb 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 4000557732..272921e568 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 @@ -1,7 +1,10 @@ -From 10ac5e5fdda44adcc2a159b6f9a2d51a51361057 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Wed, 21 Sep 2016 10:46:19 +0800 -Subject: [PATCH] tdb: Add configure options for packages +From 24911f36bcb00412e5dc4cd11fda139e09d58798 Mon Sep 17 00:00:00 2001 +From: Huang Qiyu +Date: Tue, 1 Aug 2017 03:12:09 +0900 +Subject: [PATCH] From 10ac5e5fdda44adcc2a159b6f9a2d51a51361057 Mon Sep 17 + 00:00:00 2001 From: Jackie Huang Date: Wed, 21 + Sep 2016 10:46:19 +0800 Subject: [PATCH] tdb: Add configure options for + packages Add configure options for the following packages: - acl @@ -14,6 +17,10 @@ Add configure options for the following packages: Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang + +Update for libtdb_1.3.14. + +Signed-off-by: Huang Qiyu --- lib/replace/system/wscript_configure | 6 ++- lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- @@ -37,7 +44,7 @@ index 2035474..10f9ae7 100644 # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index 145300d..310048c 100644 +index 7c50e1d..15df5c3 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -124,7 +131,7 @@ index 145300d..310048c 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') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -251,17 +301,18 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -155,23 +162,23 @@ index 145300d..310048c 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 50b2286..748eef1 100644 +index 1c9655a..8c20d3b 100644 --- a/wscript +++ b/wscript -@@ -64,7 +64,12 @@ def set_options(opt): - opt.add_option('--disable-python', - help=("disable the pytdb module"), - action="store_true", dest='disable_python', default=False) +@@ -62,7 +62,12 @@ def set_options(opt): + help=("Disable the use of pthread robust mutexes"), + action="store_true", dest='disable_tdb_mutex_locking', + default=False) - -+ opt.add_option('--with-valgrind', -+ help=("enable use of valgrind"), -+ action="store_true", dest='enable_valgrind') -+ opt.add_option('--without-valgrind', -+ help=("disable use of valgrind"), -+ action="store_false", dest='enable_valgrind', default=False) ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) def configure(conf): conf.env.disable_tdb_mutex_locking = getattr(Options.options, -- -2.8.3 +2.7.4 diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb deleted file mode 100644 index e256ac9b60..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "The tdb library" -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://do-not-check-xsltproc-manpages.patch \ - file://tdb-Add-configure-options-for-packages.patch \ -" - -SRC_URI[md5sum] = "d9627e7aacd535a8251401f914bb6924" -SRC_URI[sha256sum] = "60134e32253cac8e2efe5e0185d20123c208bcf6ad15edf2f50d80daadf8c348" - -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 - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES += "tdb-tools python-tdb python-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_python-tdb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" -RDEPENDS_python-tdb = "python" diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb new file mode 100644 index 0000000000..ccc4ee43f5 --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb @@ -0,0 +1,43 @@ +SUMMARY = "The tdb library" +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://do-not-check-xsltproc-manpages.patch \ + file://tdb-Add-configure-options-for-packages.patch \ +" + +SRC_URI[md5sum] = "dd23f2ba8ca2bfdcb833bc79d5b5ac6f" +SRC_URI[sha256sum] = "3a7d4bb79229460df530c7e1c7067ba9fb9d370aa61fff537fdc2bdf918acbe9" + +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 + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +PACKAGES += "tdb-tools python-tdb python-tdb-dbg" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_tdb-tools = "${bindir}/*" +FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_python-tdb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" +RDEPENDS_python-tdb = "python" -- cgit 1.2.3-korg