summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr_1.7.0.bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-support/apr/apr_1.7.0.bb
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr/apr_1.7.0.bb')
-rw-r--r--meta/recipes-support/apr/apr_1.7.0.bb14
1 files changed, 7 insertions, 7 deletions
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)}"
47PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 47PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
48PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests," 48PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests,"
49 49
50do_configure_prepend() { 50do_configure:prepend() {
51 # Avoid absolute paths for grep since it causes failures 51 # Avoid absolute paths for grep since it causes failures
52 # when using sstate between different hosts with different 52 # when using sstate between different hosts with different
53 # install paths for grep. 53 # install paths for grep.
@@ -61,24 +61,24 @@ do_configure_prepend() {
61MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ 61MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \
62 ${PN}-dev:${datadir}/build-1/apr_rules.mk" 62 ${PN}-dev:${datadir}/build-1/apr_rules.mk"
63 63
64FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" 64FILES:${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
65RDEPENDS_${PN}-dev += "bash" 65RDEPENDS:${PN}-dev += "bash"
66 66
67RDEPENDS_${PN}-ptest += "libgcc" 67RDEPENDS:${PN}-ptest += "libgcc"
68 68
69#for some reason, build/libtool.m4 handled by buildconf still be overwritten 69#for some reason, build/libtool.m4 handled by buildconf still be overwritten
70#when autoconf, so handle it again. 70#when autoconf, so handle it again.
71do_configure_append() { 71do_configure:append() {
72 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/libtool.m4 72 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/libtool.m4
73 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/apr_rules.mk 73 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/apr_rules.mk
74} 74}
75 75
76do_install_append() { 76do_install:append() {
77 oe_multilib_header apr.h 77 oe_multilib_header apr.h
78 install -d ${D}${datadir}/apr 78 install -d ${D}${datadir}/apr
79} 79}
80 80
81do_install_append_class-target() { 81do_install:append:class-target() {
82 sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ 82 sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \
83 -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk 83 -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
84 sed -i -e 's,${STAGING_DIR_HOST},,g' \ 84 sed -i -e 's,${STAGING_DIR_HOST},,g' \