diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/apr')
4 files changed, 55 insertions, 10 deletions
diff --git a/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb b/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb index a36f13db5..2b8676fef 100644 --- a/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb +++ b/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb @@ -24,7 +24,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-dbm=gdbm \ --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ - --without-sqlite3 \ --with-expat=${STAGING_DIR_HOST}${prefix}" @@ -54,10 +53,10 @@ do_configure_prepend_class-nativesdk() { } do_configure_append_class-nativesdk() { - sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk - sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk - sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk - sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${S}/build/rules.mk + sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk + sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk + sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk + sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${B}/build/rules.mk } do_install_append_class-target() { @@ -66,13 +65,22 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" -FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.so* ${libdir}/apr-util-1/apr_dbm_gdbm.la" -FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*" -FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" +PACKAGECONFIG ??= "crypto" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" +PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" + +#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} +FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" +FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" +FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a" + +INSANE_SKIP_${PN} += "dev-so" inherit ptest +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" + do_compile_ptest() { cd ${B}/test oe_runmake diff --git a/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch new file mode 100644 index 000000000..7521eeb46 --- /dev/null +++ b/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch @@ -0,0 +1,36 @@ +From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 19 Nov 2015 18:25:38 -0800 +Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache + +When ccache is enabled, libtool requires --tag=CC when use ccache, +otherwise when building apr-util with ccache enabled: + +| libtool: compile: unable to infer tagged configuration +| libtool: error: specify a tag with '--tag' +| libtool: compile: unable to infer tagged configuration +| make[1]: *** [buckets/apr_buckets.lo] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 5a4a988..9d57ae6 100644 +--- a/configure.in ++++ b/configure.in +@@ -246,7 +246,7 @@ case $host in + ;; + *) + if test "x$LTFLAGS" = "x"; then +- LTFLAGS='--silent' ++ LTFLAGS='--silent --tag=CC' + fi + if test "$experimental_libtool" = "yes"; then + # Use a custom-made libtool replacement +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch index 9569645b8..16499f5ac 100644 --- a/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +++ b/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch @@ -8,7 +8,7 @@ Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time. -Upstream-Status: inappropriate [oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb b/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb index 1c61e84e5..db1530530 100644 --- a/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb +++ b/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb @@ -16,6 +16,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ file://upgrade-and-fix-1.5.1.patch \ file://Fix-packet-discards-HTTP-redirect.patch \ + file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ " SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" |