[oe-commits] Baogen Shang : curl:Fix multilib header conflict - curl/curlbuild.h

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 8b2e163338331fde05e47a4843f6bd1c9b4f9333
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8b2e163338331fde05e47a4843f6bd1c9b4f9333

Author: Baogen Shang <baogen.shang at windriver.com>
Date:   Sun Jan 26 15:55:05 2014 +0800

curl:Fix multilib header conflict - curl/curlbuild.h

curl/curlbuild.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Baogen Shang <baogen.shang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-support/curl/curl_7.34.0.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/curl/curl_7.34.0.bb b/meta/recipes-support/curl/curl_7.34.0.bb
index c4e722d..b49c6e4 100644
--- a/meta/recipes-support/curl/curl_7.34.0.bb
+++ b/meta/recipes-support/curl/curl_7.34.0.bb
@@ -21,7 +21,7 @@ SRC_URI += " file://configure_ac.patch"
 SRC_URI[md5sum] = "88491df2bb32e9146e776ae6ac2f8327"
 SRC_URI[sha256sum] = "10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b"
 
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig multilib_header
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --without-libssh2 \
@@ -41,6 +41,10 @@ do_configure_prepend() {
 	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac
 }
 
+do_install_append() {
+	oe_multilib_header curl/curlbuild.h
+}
+
 PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc"
 
 FILES_${PN}-certs = "${datadir}/curl/curl-*"