diff options
Diffstat (limited to 'meta/recipes-support/db/db_5.3.28.bb')
-rw-r--r-- | meta/recipes-support/db/db_5.3.28.bb | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index 093ee44909..b7ed2c798c 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb | |||
@@ -21,8 +21,7 @@ PR = "r1" | |||
21 | PE = "1" | 21 | PE = "1" |
22 | 22 | ||
23 | SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" | 23 | SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" |
24 | SRC_URI += "file://arm-thumb-mutex_db5.patch \ | 24 | SRC_URI += "file://fix-parallel-build.patch \ |
25 | file://fix-parallel-build.patch \ | ||
26 | file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ | 25 | file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ |
27 | file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ | 26 | file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ |
28 | file://sequence-type.patch \ | 27 | file://sequence-type.patch \ |
@@ -47,7 +46,6 @@ inherit lib_package | |||
47 | PACKAGES =+ "${PN}-cxx" | 46 | PACKAGES =+ "${PN}-cxx" |
48 | FILES_${PN}-cxx = "${libdir}/*cxx*so" | 47 | FILES_${PN}-cxx = "${libdir}/*cxx*so" |
49 | 48 | ||
50 | |||
51 | # The dev package has the .so link (as in db3) and the .a's - | 49 | # The dev package has the .so link (as in db3) and the .a's - |
52 | # it is therefore incompatible (cannot be installed at the | 50 | # it is therefore incompatible (cannot be installed at the |
53 | # same time) as the db3 package | 51 | # same time) as the db3 package |
@@ -59,18 +57,8 @@ FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so" | |||
59 | # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) | 57 | # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) |
60 | DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql" | 58 | DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql" |
61 | 59 | ||
62 | EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx --with-sysroot" | 60 | EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx --with-sysroot STRIP=true" |
63 | 61 | ||
64 | # Override the MUTEX setting here, the POSIX library is | ||
65 | # the default - "POSIX/pthreads/library". | ||
66 | # Don't ignore the nice SWP instruction on the ARM: | ||
67 | # These enable the ARM assembler mutex code, this won't | ||
68 | # work with thumb compilation... | ||
69 | ARM_MUTEX = "--with-mutex=ARM/gcc-assembly" | ||
70 | MUTEX = "" | ||
71 | MUTEX_arm = "${ARM_MUTEX}" | ||
72 | MUTEX_armeb = "${ARM_MUTEX}" | ||
73 | EXTRA_OECONF += "${MUTEX} STRIP=true" | ||
74 | EXTRA_OEMAKE += "LIBTOOL='./${HOST_SYS}-libtool'" | 62 | EXTRA_OEMAKE += "LIBTOOL='./${HOST_SYS}-libtool'" |
75 | 63 | ||
76 | EXTRA_AUTORECONF += "--exclude=autoheader -I ${S}/dist/aclocal -I${S}/dist/aclocal_java" | 64 | EXTRA_AUTORECONF += "--exclude=autoheader -I ${S}/dist/aclocal -I${S}/dist/aclocal_java" |