EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename tools/lzma to tools/lzma-old (preparation for adding a new lzma version)

Browse Source 
SVN-Revision: 15595
This commit is contained in:
Felix Fietkau 2009-05-04 17:04:03 +00:00
parent d7c2fc499d
commit b20fa8f579
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/Makefile
View File

@ -12,14 +12,14 @@ curdir:=tools
tools-y := tools-y :=
tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4) += gmp mpfr tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4) += gmp mpfr
tools-y += m4 autoconf automake bison pkg-config sed 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-y += firmware-utils patch-cmdline quilt yaffs2
tools-$(CONFIG_CCACHE) += ccache tools-$(CONFIG_CCACHE) += ccache
tools-$(CONFIG_powerpc) += dtc tools-$(CONFIG_powerpc) += dtc
# builddir dependencies # builddir dependencies
$(curdir)/squashfs/compile := $(curdir)/lzma/install $(curdir)/squashfs/compile := $(curdir)/lzma-old/install
$(curdir)/quilt/compile := $(curdir)/sed/install $(curdir)/quilt/compile := $(curdir)/sed/install
$(curdir)/dtc/compile := $(curdir)/bison/install $(curdir)/dtc/compile := $(curdir)/bison/install
$(curdir)/autoconf/compile := $(curdir)/m4/install $(curdir)/autoconf/compile := $(curdir)/m4/install

4
tools/lzma/Makefile → tools/lzma-old/Makefile
View File

@ -26,13 +26,13 @@ define Host/Compile
endef endef
define Host/Install 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/ $(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/
endef endef
define Host/Clean define Host/Clean
rm -f \ rm -f \
$(STAGING_DIR_HOST)/lib/liblzma.a \ $(STAGING_DIR_HOST)/lib/liblzma-old.a \
$(STAGING_DIR_HOST)/bin/lzma $(STAGING_DIR_HOST)/bin/lzma
endef endef

0
tools/lzma/patches/100-lzma_zlib.patch → tools/lzma-old/patches/100-lzma_zlib.patch
View File

0
tools/lzma/patches/110-ranlib.patch → tools/lzma-old/patches/110-ranlib.patch
View File

10
tools/squashfs/patches/100-lzma.patch
View File

@ -1,17 +1,11 @@
--- a/squashfs-tools/Makefile --- a/squashfs-tools/Makefile
+++ b/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 @@ -7,6 +8,9 @@ all: mksquashfs unsquashfs
mksquashfs: mksquashfs.o read_fs.o sort.o mksquashfs: mksquashfs.o read_fs.o sort.o
$(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
+mksquashfs-lzma: mksquashfs.o read_fs.o sort.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 mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
@ -21,7 +15,7 @@
$(CC) unsquashfs.o -lz -o $@ $(CC) unsquashfs.o -lz -o $@
+unsquashfs-lzma: unsquashfs.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 unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
+ +