From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 19 Nov 2009 19:03:53 +0000 (-0200)
Subject: lzma.inc: use CXX and CC environment values to really do cross compile
X-Git-Tag: Release-2010-05/1~339^2~25^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5555bc82e576dfe4a58b5a0ccf0ee12aed8ad2aa;p=openembedded.git

lzma.inc: use CXX and CC environment values to really do cross compile

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc
index bffbeb2d3b..4d31a44cd0 100644
--- a/recipes/lzma/lzma.inc
+++ b/recipes/lzma/lzma.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
 DEPENDS = "zlib"
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2 \
            file://001-large_files.patch;patch=1 \
@@ -21,6 +21,11 @@ do_unpack_append() {
         os.system("find ${S} -type f -print0 | xargs -0 sed 's/\r$//' -i")
 }
 
+do_patch_append() {
+        # Hack to ensure we use our environment values
+        os.system("find ${S} -type f -name makefile.gcc -print0 | xargs -0 sed 's/^CXX =/CXX ?=/;s/^CXX_C =/CXX_C ?=/;s/CXX_C/CC/' -i")
+}
+
 do_compile() {
         oe_runmake -C C/LzmaUtil
         oe_runmake -C CPP/7zip/Compress/LZMA_Alone