aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/Makefile4
-rw-r--r--tools/lzma-old/Makefile (renamed from tools/lzma/Makefile)4
-rw-r--r--tools/lzma-old/patches/100-lzma_zlib.patch (renamed from tools/lzma/patches/100-lzma_zlib.patch)0
-rw-r--r--tools/lzma-old/patches/110-ranlib.patch (renamed from tools/lzma/patches/110-ranlib.patch)0
-rw-r--r--tools/squashfs/patches/100-lzma.patch10
5 files changed, 6 insertions, 12 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 54520bc75c..19ee453343 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,14 +12,14 @@ curdir:=tools
tools-y :=
tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4) += gmp mpfr
tools-y += m4 autoconf automake bison pkg-config sed
-tools-y += sstrip ipkg-utils genext2fs squashfs mtd-utils lzma mkimage
+tools-y += sstrip ipkg-utils genext2fs squashfs mtd-utils lzma-old mkimage
tools-y += firmware-utils patch-cmdline quilt yaffs2
tools-$(CONFIG_CCACHE) += ccache
tools-$(CONFIG_powerpc) += dtc
# builddir dependencies
-$(curdir)/squashfs/compile := $(curdir)/lzma/install
+$(curdir)/squashfs/compile := $(curdir)/lzma-old/install
$(curdir)/quilt/compile := $(curdir)/sed/install
$(curdir)/dtc/compile := $(curdir)/bison/install
$(curdir)/autoconf/compile := $(curdir)/m4/install
diff --git a/tools/lzma/Makefile b/tools/lzma-old/Makefile
index b982415c5a..2999266050 100644
--- a/tools/lzma/Makefile
+++ b/tools/lzma-old/Makefile
@@ -26,13 +26,13 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
+ $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/liblzma-old.a
$(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/
endef
define Host/Clean
rm -f \
- $(STAGING_DIR_HOST)/lib/liblzma.a \
+ $(STAGING_DIR_HOST)/lib/liblzma-old.a \
$(STAGING_DIR_HOST)/bin/lzma
endef
diff --git a/tools/lzma/patches/100-lzma_zlib.patch b/tools/lzma-old/patches/100-lzma_zlib.patch
index 7436cfe515..7436cfe515 100644
--- a/tools/lzma/patches/100-lzma_zlib.patch
+++ b/tools/lzma-old/patches/100-lzma_zlib.patch
diff --git a/tools/lzma/patches/110-ranlib.patch b/tools/lzma-old/patches/110-ranlib.patch
index 813b4137f1..813b4137f1 100644
--- a/tools/lzma/patches/110-ranlib.patch
+++ b/tools/lzma-old/patches/110-ranlib.patch
diff --git a/tools/squashfs/patches/100-lzma.patch b/tools/squashfs/patches/100-lzma.patch
index 1050e094d5..e3b2a3a89c 100644
--- a/tools/squashfs/patches/100-lzma.patch
+++ b/tools/squashfs/patches/100-lzma.patch
@@ -1,17 +1,11 @@
--- a/squashfs-tools/Makefile
+++ b/squashfs-tools/Makefile
-@@ -1,4 +1,5 @@
- INCLUDEDIR = .
-+#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
-
- CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
-
@@ -7,6 +8,9 @@ all: mksquashfs unsquashfs
mksquashfs: mksquashfs.o read_fs.o sort.o
$(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
+mksquashfs-lzma: mksquashfs.o read_fs.o sort.o
-+ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@
++ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma-old -o $@
+
mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
@@ -21,7 +15,7 @@
$(CC) unsquashfs.o -lz -o $@
+unsquashfs-lzma: unsquashfs.o
-+ $(CXX) unsquashfs.o -L$(LZMAPATH) -llzma -o $@
++ $(CXX) unsquashfs.o -L$(LZMAPATH) -llzma-old -o $@
+
unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
+