put some sense into lzma-native

NOTE: NEVER EVER call 'make' directly in OE - use oe_runmake and adjust CFLAGS as necessary

diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb
index a47cd1d..174ed70 100644 (file)
--- a/packages/lzma/lzma-native_4.17.bb
+++ b/packages/lzma/lzma-native_4.17.bb
@@ -1,19 +1,22 @@
 DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression."
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
-       file://lzma-406-zlib-stream.patch;patch=1"
-S = "${WORKDIR}"
+          file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
+S = "${WORKDIR}/SRC"
 
 inherit native
 
+CFLAGS += "-c -I${S}"
+
 do_compile() {
-       make -C ${S}/SRC/7zip/Compress/LZMA_Alone
-       make -C ${S}/SRC/7zip/Compress/LZMA_Lib
+       oe_runmake -C 7zip/Compress/LZMA_Alone
+       oe_runmake -C 7zip/Compress/LZMA_Lib
 }
 
 do_stage () {
-       install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
-       oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
+       install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
+       oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
 }