diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/db')
3 files changed, 42 insertions, 3 deletions
diff --git a/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch b/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch new file mode 100644 index 000000000..d4c6bb8e0 --- /dev/null +++ b/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch @@ -0,0 +1,32 @@ +From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 16 Nov 2015 22:20:49 -0800 +Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo + +Fixed parallel issue: +libtool: link: `os_map.lo' is not a valid libtool object +Makefile:867: recipe for target 'libdb-6.0.la' failed + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + dist/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dist/Makefile.in b/dist/Makefile.in +index 0a42375..d9e05b9 100644 +--- a/dist/Makefile.in ++++ b/dist/Makefile.in +@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) + $(LN) -s $(libdb_version) $(libdb) + + # Shared C library. +-$(libso_target): $(C_OBJS) bt_rec@o@ ++$(libso_target): $(C_OBJS) bt_rec@o@ os_map@o@ + $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ + $(LIBCSO_LIBS) + $(RM) $(libdb) +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-support/db/db_5.3.28.bb b/yocto-poky/meta/recipes-support/db/db_5.3.28.bb index e8b814e06..c724f049f 100644 --- a/yocto-poky/meta/recipes-support/db/db_5.3.28.bb +++ b/yocto-poky/meta/recipes-support/db/db_5.3.28.bb @@ -10,7 +10,7 @@ # same system at the same time if really necessary. SECTION = "libs" SUMMARY = "Berkeley Database v5" -HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" +HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" LICENSE = "Sleepycat" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" @@ -76,6 +76,7 @@ MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" EXTRA_OECONF += "${MUTEX}" +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" # Cancel the site stuff - it's set for db3 and destroys the # configure. diff --git a/yocto-poky/meta/recipes-support/db/db_6.0.30.bb b/yocto-poky/meta/recipes-support/db/db_6.0.30.bb index d49df62b9..50a469b08 100644 --- a/yocto-poky/meta/recipes-support/db/db_6.0.30.bb +++ b/yocto-poky/meta/recipes-support/db/db_6.0.30.bb @@ -10,22 +10,27 @@ # same system at the same time if really necessary. SECTION = "libs" SUMMARY = "Berkeley Database v6" -HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" +HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" LICENSE = "AGPL-3.0" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" -RECIPE_NO_UPDATE_REASON = "Updating to 6.1.x requires also updating rpm to 5.4.15" +# Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support. SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ file://fix-parallel-build.patch \ file://Makefile-let-libso_target-depend-on-bt_rec.patch \ + file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch;patchdir=.. \ " SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" SRC_URI[sha256sum] = "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2" +# Exclude NC versions which lack AES encryption +UPSTREAM_CHECK_REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar" +UPSTREAM_CHECK_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html" + LIC_FILES_CHKSUM = "file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490" inherit autotools @@ -78,6 +83,7 @@ MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" EXTRA_OECONF += "${MUTEX}" +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" # Cancel the site stuff - it's set for db3 and destroys the # configure. |
