diff options
Diffstat (limited to 'recipes/lzma/lzma.inc')
| -rw-r--r-- | recipes/lzma/lzma.inc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc index fc40c9313b..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 = "r1" +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 \ @@ -17,8 +17,13 @@ EXTRA_OEMAKE = "-f makefile.gcc" CFLAGS += "-c -I${S}" do_unpack_append() { - # It has few files with wrong encoding - os.system("find ${S} -type f -print0 | xargs -0 dos2unix") + # Replace MS-DOS line-endings with Unix style line-endings + 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() { |