From b325ceaf4e08a47dbad413f573796cfa4f95a164 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 18 Apr 2016 17:00:52 -0400 Subject: libldb: Update to latest stable The update of Samba requires a newer version of libldb, so update it. Signed-off-by: Joe MacDonald Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- ...-import-target-module-while-cross-compile.patch | 19 +++++---- .../recipes-support/libldb/libldb_1.1.21.bb | 49 ---------------------- .../recipes-support/libldb/libldb_1.1.26.bb | 49 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 58 deletions(-) delete mode 100644 meta-networking/recipes-support/libldb/libldb_1.1.21.bb create mode 100644 meta-networking/recipes-support/libldb/libldb_1.1.26.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch index 2425a55e39..fdd312c0ad 100755 --- a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch +++ b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch @@ -3,18 +3,19 @@ we just check whether does the module exist. Signed-off-by: Bian Naimeng ---- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:42:12.265127110 +0800 -+++ ldb-1.1.17/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:45:25.717119550 +0800 -@@ -1,7 +1,7 @@ - # functions to support bundled libraries +Index: ldb-1.1.26/buildtools/wafsamba/samba_bundled.py +=================================================================== +--- ldb-1.1.26.orig/buildtools/wafsamba/samba_bundled.py ++++ ldb-1.1.26/buildtools/wafsamba/samba_bundled.py +@@ -2,6 +2,7 @@ + import sys + import Build, Options, Logs ++import imp, os from Configure import conf --import sys, Logs -+import sys, Logs, imp - from samba_utils import * + from samba_utils import TO_LIST - def PRIVATE_NAME(bld, name, private_extension, private_library): -@@ -218,17 +218,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li +@@ -230,17 +231,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li # versions minversion = minimum_library_version(conf, libname, minversion) diff --git a/meta-networking/recipes-support/libldb/libldb_1.1.21.bb b/meta-networking/recipes-support/libldb/libldb_1.1.21.bb deleted file mode 100644 index bdad87d38a..0000000000 --- a/meta-networking/recipes-support/libldb/libldb_1.1.21.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://ldb.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" - -DEPENDS += "libbsd libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python" - -SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ - file://do-not-import-target-module-while-cross-compile.patch \ - " - -PACKAGECONFIG[ldap] = ",,openldap" -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" - -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" - -SRC_URI[md5sum] = "94ba09c7452fff68df3481686c56677e" -SRC_URI[sha256sum] = "267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1" - -inherit waf-samba - -S = "${WORKDIR}/ldb-${PV}" - -EXTRA_OECONF += "--disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-modulesdir=${libdir}/ldb/modules \ - --with-privatelibdir=${libdir}/ldb \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " -DISABLE_STATIC = "" - -PACKAGES += "pyldb pyldb-dbg pyldb-dev" - -FILES_${PN} += "${libdir}/ldb/*" -FILES_${PN}-dbg += "${libdir}/ldb/.debug/* \ - ${libdir}/ldb/modules/ldb/.debug/*" - -FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpyldb-util.so.1 \ - ${libdir}/libpyldb-util.so.1.1.17 \ - " -FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ - ${libdir}/.debug/libpyldb-util.so.1.1.17" -FILES_pyldb-dev = "${libdir}/libpyldb-util.so" diff --git a/meta-networking/recipes-support/libldb/libldb_1.1.26.bb b/meta-networking/recipes-support/libldb/libldb_1.1.26.bb new file mode 100644 index 0000000000..5458d47285 --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb_1.1.26.bb @@ -0,0 +1,49 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://ldb.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" + +DEPENDS += "libbsd libtdb libtalloc libtevent popt" +RDEPENDS_pyldb += "python" + +SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ + file://do-not-import-target-module-while-cross-compile.patch \ + " + +PACKAGECONFIG[ldap] = ",,openldap" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" + +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ + file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" + +SRC_URI[md5sum] = "31780b702b638ad32aa5d9853d257839" +SRC_URI[sha256sum] = "8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6" + +inherit waf-samba + +S = "${WORKDIR}/ldb-${PV}" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-modulesdir=${libdir}/ldb/modules \ + --with-privatelibdir=${libdir}/ldb \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " +DISABLE_STATIC = "" + +PACKAGES += "pyldb pyldb-dbg pyldb-dev" + +FILES_${PN} += "${libdir}/ldb/*" +FILES_${PN}-dbg += "${libdir}/ldb/.debug/* \ + ${libdir}/ldb/modules/ldb/.debug/*" + +FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpyldb-util.so.1 \ + ${libdir}/libpyldb-util.so.1.1.17 \ + " +FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ + ${libdir}/.debug/libpyldb-util.so.1.1.17" +FILES_pyldb-dev = "${libdir}/libpyldb-util.so" -- cgit 1.2.3-korg