Patchwork [v3,3/8] apr: Fix multilib header conflict - apr.h

login
register
mail settings
Submitter Mark Hatle
Date July 26, 2011, 9:31 p.m.
Message ID <16aed39c6ed0f3b5c0d9032f8523a125fb0dbfa1.1311715727.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/8591/
State New, archived
Headers show

Comments

Mark Hatle - July 26, 2011, 9:31 p.m.
apr.h conflicts between 32-bit and 64-bit versions

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-support/apr/apr_1.4.2.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.2.bb
index 89bdadf..b37001d 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"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
                     file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
            file://configure_fixes.patch;patch=1 \
@@ -17,7 +17,7 @@  SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
 SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
 SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
 
-inherit autotools lib_package binconfig
+inherit autotools lib_package binconfig multilib_header
 
 OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
 
@@ -34,6 +34,10 @@  do_configure_append() {
 	sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk
 }
 
+do_install_append() {
+	oe_multilib_header apr.h
+}
+
 SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
 
 apr_sysroot_preprocess () {