diff options
Diffstat (limited to 'meta/recipes-support/apr/apr-util_1.6.1.bb')
-rw-r--r-- | meta/recipes-support/apr/apr-util_1.6.1.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb index 0dd8f025e8..4e183ca374 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb | |||
@@ -19,10 +19,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ | |||
19 | SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" | 19 | SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" |
20 | SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" | 20 | SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" |
21 | 21 | ||
22 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ | 22 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ |
23 | --without-odbc \ | 23 | --without-odbc \ |
24 | --without-pgsql \ | 24 | --without-pgsql \ |
25 | --with-dbm=gdbm \ | ||
26 | --without-sqlite2 \ | 25 | --without-sqlite2 \ |
27 | --with-expat=${STAGING_DIR_HOST}${prefix}" | 26 | --with-expat=${STAGING_DIR_HOST}${prefix}" |
28 | 27 | ||
@@ -36,6 +35,7 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | |||
36 | do_configure_append() { | 35 | do_configure_append() { |
37 | if [ "${CLASSOVERRIDE}" = "class-target" ]; then | 36 | if [ "${CLASSOVERRIDE}" = "class-target" ]; then |
38 | cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk | 37 | cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk |
38 | sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${B}/build/rules.mk | ||
39 | fi | 39 | fi |
40 | } | 40 | } |
41 | do_configure_prepend_class-native() { | 41 | do_configure_prepend_class-native() { |
@@ -50,6 +50,7 @@ do_configure_append_class-native() { | |||
50 | 50 | ||
51 | do_configure_prepend_class-nativesdk() { | 51 | do_configure_prepend_class-nativesdk() { |
52 | cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk | 52 | cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk |
53 | sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk | ||
53 | } | 54 | } |
54 | 55 | ||
55 | do_configure_append_class-nativesdk() { | 56 | do_configure_append_class-nativesdk() { |
@@ -69,7 +70,7 @@ PACKAGECONFIG ??= "crypto gdbm" | |||
69 | PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" | 70 | PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" |
70 | PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" | 71 | PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" |
71 | PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" | 72 | PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" |
72 | PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" | 73 | PACKAGECONFIG[gdbm] = "--with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" |
73 | 74 | ||
74 | #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} | 75 | #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} |
75 | FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" | 76 | FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" |