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 | 24 |
1 files changed, 12 insertions, 12 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" | |||
32 | 32 | ||
33 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | 33 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" |
34 | 34 | ||
35 | do_configure_append() { | 35 | do_configure:append() { |
36 | if [ "${CLASSOVERRIDE}" = "class-target" ]; then | 36 | if [ "${CLASSOVERRIDE}" = "class-target" ]; then |
37 | 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 | 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() { |
42 | mkdir ${B}/build | 42 | mkdir ${B}/build |
43 | cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk | 43 | cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk |
44 | } | 44 | } |
45 | do_configure_append_class-native() { | 45 | do_configure:append:class-native() { |
46 | sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk | 46 | sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk |
47 | # sometimes there isn't SHELL | 47 | # sometimes there isn't SHELL |
48 | sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk | 48 | sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk |
49 | } | 49 | } |
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 | sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk |
54 | } | 54 | } |
55 | 55 | ||
56 | do_configure_append_class-nativesdk() { | 56 | do_configure:append:class-nativesdk() { |
57 | sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk | 57 | sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk |
58 | sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk | 58 | sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk |
59 | sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk | 59 | sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk |
60 | sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${B}/build/rules.mk | 60 | sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${B}/build/rules.mk |
61 | } | 61 | } |
62 | 62 | ||
63 | do_install_append_class-target() { | 63 | do_install:append:class-target() { |
64 | sed -i -e 's,${STAGING_DIR_HOST},,g' \ | 64 | sed -i -e 's,${STAGING_DIR_HOST},,g' \ |
65 | -e 's,APU_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ | 65 | -e 's,APU_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ |
66 | -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config | 66 | -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- | |||
73 | PACKAGECONFIG[gdbm] = "--with-dbm=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" |
74 | 74 | ||
75 | #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} |
76 | 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}" |
77 | FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" | 77 | FILES:${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" |
78 | FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a" | 78 | FILES:${PN}-staticdev += "${libdir}/apr-util-1/*.a" |
79 | 79 | ||
80 | INSANE_SKIP_${PN} += "dev-so" | 80 | INSANE_SKIP:${PN} += "dev-so" |
81 | 81 | ||
82 | inherit ptest | 82 | inherit ptest |
83 | 83 | ||
84 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" | 84 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" |
85 | RDEPENDS_${PN}-ptest += "libgcc" | 85 | RDEPENDS:${PN}-ptest += "libgcc" |
86 | 86 | ||
87 | do_compile_ptest() { | 87 | do_compile_ptest() { |
88 | cd ${B}/test | 88 | cd ${B}/test |