summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-07-26 12:58:58 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:45:47 +0100
commit911dc39eef7b1f9c88b90d03d23aaab11ace16ab (patch)
treece8adc30a316fe511d7a9dbeca0035c10d56a27c
parent5aef1898a5b5e1a91fa5c2ce834b1c69c3df7900 (diff)
downloadpoky-911dc39eef7b1f9c88b90d03d23aaab11ace16ab.tar.gz
apr: Fix multilib header conflict - apr.h
apr.h conflicts between 32-bit and 64-bit versions (From OE-Core rev: 6e280bf3e2edf3a9e7dfe0e86bcc5c763d52211a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr_1.4.2.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.2.bb
index 89bdadf955..b37001d4ca 100644
--- a/meta/recipes-support/apr/apr_1.4.2.bb
+++ b/meta/recipes-support/apr/apr_1.4.2.bb
@@ -6,7 +6,7 @@ LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ 6LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
7 file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" 7 file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
8 8
9PR = "r0" 9PR = "r1"
10 10
11SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \ 11SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
12 file://configure_fixes.patch;patch=1 \ 12 file://configure_fixes.patch;patch=1 \
@@ -17,7 +17,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
17SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35" 17SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
18SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391" 18SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
19 19
20inherit autotools lib_package binconfig 20inherit autotools lib_package binconfig multilib_header
21 21
22OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" 22OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
23 23
@@ -34,6 +34,10 @@ do_configure_append() {
34 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk 34 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk
35} 35}
36 36
37do_install_append() {
38 oe_multilib_header apr.h
39}
40
37SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" 41SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
38 42
39apr_sysroot_preprocess () { 43apr_sysroot_preprocess () {