diff options
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r-- | meta/recipes-support/apr/apr-util_1.6.1.bb | 24 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr_1.7.0.bb | 14 |
2 files changed, 19 insertions, 19 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 4e183ca374..b851d46351 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -32,35 +32,35 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" -do_configure_append() { +do_configure:append() { if [ "${CLASSOVERRIDE}" = "class-target" ]; then cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${B}/build/rules.mk fi } -do_configure_prepend_class-native() { +do_configure:prepend:class-native() { mkdir ${B}/build cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk } -do_configure_append_class-native() { +do_configure:append:class-native() { sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk # sometimes there isn't SHELL sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk } -do_configure_prepend_class-nativesdk() { +do_configure:prepend:class-nativesdk() { cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk } -do_configure_append_class-nativesdk() { +do_configure:append:class-nativesdk() { 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() { +do_install:append:class-target() { sed -i -e 's,${STAGING_DIR_HOST},,g' \ -e 's,APU_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config @@ -73,16 +73,16 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without- PACKAGECONFIG[gdbm] = "--with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #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" +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" +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" -RDEPENDS_${PN}-ptest += "libgcc" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" +RDEPENDS:${PN}-ptest += "libgcc" do_compile_ptest() { cd ${B}/test diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index 82317396cd..08d9edf3c2 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -47,7 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests," -do_configure_prepend() { +do_configure:prepend() { # Avoid absolute paths for grep since it causes failures # when using sstate between different hosts with different # install paths for grep. @@ -61,24 +61,24 @@ do_configure_prepend() { MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ ${PN}-dev:${datadir}/build-1/apr_rules.mk" -FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" -RDEPENDS_${PN}-dev += "bash" +FILES:${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" +RDEPENDS:${PN}-dev += "bash" -RDEPENDS_${PN}-ptest += "libgcc" +RDEPENDS:${PN}-ptest += "libgcc" #for some reason, build/libtool.m4 handled by buildconf still be overwritten #when autoconf, so handle it again. -do_configure_append() { +do_configure:append() { sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/libtool.m4 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/apr_rules.mk } -do_install_append() { +do_install:append() { oe_multilib_header apr.h install -d ${D}${datadir}/apr } -do_install_append_class-target() { +do_install:append:class-target() { sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk sed -i -e 's,${STAGING_DIR_HOST},,g' \ |