mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

lzma: drop the recipes

Browse Source 
* only dependency on this was from links's PACKAGECONFIG
* xz from oe-core provides liblzma as well and they conflict
  in sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2014-10-07 02:17:47 +02:00
parent 1cd3c1a945
commit 1d76ab017a
8 changed files with 1 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/links/links.inc
+1 -1
View File
@@ -12,6 +12,6 @@ SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
PACKAGECONFIG ??= ""
PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,lzma"
PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
inherit autotools pkgconfig
meta-oe/recipes-support/lzma/lzma-4.65/001-large_files.patch
-13
View File
@@ -1,13 +0,0 @@
Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
===================================================================
--- lzma-4.65.orig/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2009-05-15 23:33:51.000000000 +0200
+++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2009-06-01 22:00:54.000000000 +0200
@@ -3,7 +3,7 @@
CXX_C = gcc -O2 -Wall
LIB = -lm
RM = rm -f
-CFLAGS = -c
+CFLAGS = -c -D_FILE_OFFSET_BITS=64
ifdef SystemDrive
IS_MINGW = 1
meta-oe/recipes-support/lzma/lzma-4.65/002-lzmp.patch
-1059
View File
File diff suppressed because it is too large Load Diff
meta-oe/recipes-support/lzma/lzma-4.65/003-compile_fixes.patch
-26
View File
@@ -1,26 +0,0 @@
diff -urN lzma-4.65/CPP/7zip/Common/FileStreams.h lzma-4.65.new/CPP/7zip/Common/FileStreams.h
--- lzma-4.65/CPP/7zip/Common/FileStreams.h 2009-05-15 23:33:51.000000000 +0200
+++ lzma-4.65.new/CPP/7zip/Common/FileStreams.h 2009-06-01 22:30:01.000000000 +0200
@@ -72,6 +72,7 @@
public IOutStream,
public CMyUnknownImp
{
+public:
#ifdef USE_WIN_FILE
NWindows::NFile::NIO::COutFile File;
#else
diff -urN lzma-4.65/CPP/Common/MyWindows.h lzma-4.65.new/CPP/Common/MyWindows.h
--- lzma-4.65/CPP/Common/MyWindows.h 2009-05-15 23:33:51.000000000 +0200
+++ lzma-4.65.new/CPP/Common/MyWindows.h 2009-06-01 22:29:26.000000000 +0200
@@ -101,8 +101,11 @@
#ifdef __cplusplus
+#ifndef INITGUID
+#define INITGUID
DEFINE_GUID(IID_IUnknown,
0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+#endif
struct IUnknown
{
STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE;
meta-oe/recipes-support/lzma/lzma-4.65/100-static_library.patch
-70
View File
@@ -1,70 +0,0 @@
--- a/C/LzmaUtil/makefile.gcc
+++ b/C/LzmaUtil/makefile.gcc
@@ -1,44 +1,53 @@
PROG = lzma
-CXX = g++
-LIB =
+CC = gcc
+LIB = liblzma.a
RM = rm -f
CFLAGS = -c -O2 -Wall
+AR = ar
+RANLIB = ranlib
OBJS = \
- LzmaUtil.o \
Alloc.o \
LzFind.o \
LzmaDec.o \
LzmaEnc.o \
+ LzmaLib.o \
7zFile.o \
7zStream.o \
-
all: $(PROG)
-$(PROG): $(OBJS)
- $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2)
+$(PROG): LzmaUtil.o $(LIB)
+ $(CC) -o $(PROG) $(LDFLAGS) $< $(LIB)
LzmaUtil.o: LzmaUtil.c
- $(CXX) $(CFLAGS) LzmaUtil.c
+ $(CC) $(CFLAGS) LzmaUtil.c
+
+$(LIB): $(OBJS)
+ rm -f $@
+ $(AR) rcu $@ $(OBJS)
+ $(RANLIB) $@
Alloc.o: ../Alloc.c
- $(CXX) $(CFLAGS) ../Alloc.c
+ $(CC) $(CFLAGS) ../Alloc.c
LzFind.o: ../LzFind.c
- $(CXX) $(CFLAGS) ../LzFind.c
+ $(CC) $(CFLAGS) ../LzFind.c
LzmaDec.o: ../LzmaDec.c
- $(CXX) $(CFLAGS) ../LzmaDec.c
+ $(CC) $(CFLAGS) ../LzmaDec.c
LzmaEnc.o: ../LzmaEnc.c
- $(CXX) $(CFLAGS) ../LzmaEnc.c
+ $(CC) $(CFLAGS) ../LzmaEnc.c
+
+LzmaLib.o: ../LzmaLib.c
+ $(CC) $(CFLAGS) ../LzmaLib.c
7zFile.o: ../7zFile.c
- $(CXX) $(CFLAGS) ../7zFile.c
+ $(CC) $(CFLAGS) ../7zFile.c
7zStream.o: ../7zStream.c
- $(CXX) $(CFLAGS) ../7zStream.c
+ $(CC) $(CFLAGS) ../7zStream.c
clean:
- -$(RM) $(PROG) $(OBJS)
+ -$(RM) $(PROG) *.o *.a
meta-oe/recipes-support/lzma/lzma-4.65/makefile-cleanup.patch
-18
View File
@@ -1,18 +0,0 @@
Index: lzma-4.65/C/LzmaUtil/makefile.gcc
===================================================================
--- lzma-4.65.orig/C/LzmaUtil/makefile.gcc
+++ lzma-4.65/C/LzmaUtil/makefile.gcc
@@ -1,10 +1,10 @@
PROG = lzma
-CC = gcc
+CC ?= gcc
LIB = liblzma.a
RM = rm -f
CFLAGS = -c -O2 -Wall
-AR = ar
-RANLIB = ranlib
+AR ?= ar
+RANLIB ?= ranlib
OBJS = \
Alloc.o \
meta-oe/recipes-support/lzma/lzma.inc
-35
View File
@@ -1,35 +0,0 @@
DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression."
HOMEPAGE = "http://www.7-zip.org/"
LICENSE = "LGPL"
LIC_FILES_CHKSUM = "file://lzma.txt;md5=20251cdc2e3793cceab11878d0aa11b1"
INC_PR = "r7"
SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@d.getVar('PV',1).replace('.','')}.tar.bz2;subdir=${BPN}-${PV} \
file://001-large_files.patch \
file://002-lzmp.patch \
file://003-compile_fixes.patch \
file://100-static_library.patch \
file://makefile-cleanup.patch"
EXTRA_OEMAKE = "-f makefile.gcc"
do_unpack_append() {
import subprocess
# Replace MS-DOS line-endings with Unix style line-endings
subprocess.call("find . -type f -print0 | xargs -0 sed 's/\r$//' -i",
cwd=d.getVar("S", True), shell=True)
}
do_compile() {
oe_runmake CFLAGS='${CFLAGS} -c' -C C/LzmaUtil
oe_runmake CXX_C='${CC} ${CFLAGS}' CXX='${CXX} ${CXXFLAGS}' \
-C CPP/7zip/Compress/LZMA_Alone
}
do_install() {
install -d ${D}${bindir} ${D}${libdir}
install -m 0755 CPP/7zip/Compress/LZMA_Alone/lzma ${D}${bindir}
oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir}
}
BBCLASSEXTEND = "native"
meta-oe/recipes-support/lzma/lzma_4.65.bb
-5
View File
@@ -1,5 +0,0 @@
require lzma.inc
PR = "${INC_PR}.1"
SRC_URI[md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"
SRC_URI[sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e"