Changeset 99

Timestamp:

06/18/06 18:26:39 (6 years ago)

Author:

tg

Message:

move lzma from target to toolchain (idea by wbx@ and me) and
fix makefile cflags bullshit by original patch0r

tested to build on MirBSD

agreed wbx@

Files:

• trunk/freewrt/target/Makefile (modified) (2 diffs)
• trunk/freewrt/toolchain/Makefile (modified) (1 diff)
• trunk/freewrt/toolchain/lzma (moved) (moved from trunk/freewrt/target/lzma)
• trunk/freewrt/toolchain/lzma/lzma-zlib.patch (modified) (4 diffs)

trunk/freewrt/target/Makefile

@@ -6 +6 @@
-        mkdir -p $(BIN_DIR)
-
-lzma-install
+
-linux-install: $(BIN_DIR)
-
@@ -12 +12 @@
-compile: linux-compile
-install: image_clean linux-install
-lzma-clean 
+
-
-image_clean:

trunk/freewrt/toolchain/Makefile

@@ -1 +1 @@
-# Main makefile for the toolchain
-include $(TOPDIR)/rules.mk
-
+ lzma
-
-TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))

trunk/freewrt/toolchain/lzma/lzma-zlib.patch

@@ +1 @@
+$FreeWRT$
+
-diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp
---- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp   2005-09-22 10:55:34.000000000 +0200
@@ -42 +44 @@
-+AR = ar
-+RM = rm -f
- =
+X = $(CFLAGS)
-+
-+OBJS = \
@@ -71 +73 @@
-+
-+ZLib.o: ZLib.cpp
-
+X
-+
-+LZMADecoder.o: ../LZMA/LZMADecoder.cpp
-
+X
-+
-+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
-
+X
-+
-+LZInWindow.o: ../LZ/LZInWindow.cpp
-
+X
-+
-+LZOutWindow.o: ../LZ/LZOutWindow.cpp
-
+X
-+
-+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
-
+X
-+
-+InBuffer.o: ../../Common/InBuffer.cpp
-
+X
-+
-+OutBuffer.o: ../../Common/OutBuffer.cpp
-
+X
-+
-+StreamUtils.o: ../../Common/StreamUtils.cpp
-
+X
-+
-+FileStreams.o: ../../Common/FileStreams.cpp
-
+X
-+
-+Alloc.o: ../../../Common/Alloc.cpp
-
+X
-+
-+C_FileIO.o: ../../../Common/C_FileIO.cpp
-
+X
-+
-+CommandLineParser.o: ../../../Common/CommandLineParser.cpp
-
+X
-+
-+CRC.o: ../../../Common/CRC.cpp
-
+X
-+
-+MyWindows.o: ../../../Common/MyWindows.cpp
-
+X
-+
-+String.o: ../../../Common/String.cpp
-
+X
-+
-+StringConvert.o: ../../../Common/StringConvert.cpp
-
+X
-+
-+StringToInt.o: ../../../Common/StringToInt.cpp
-
+X
-+
-+Vector.o: ../../../Common/Vector.cpp
-
+X
-+
-+clean:
@@ -407 +409 @@
-+       return Z_OK;
-+}
+--- lzma/C/7zip/Compress/LZMA_Alone/makefile.gcc.orig   Sun Jun 18 16:09:23 2006
++++ lzma/C/7zip/Compress/LZMA_Alone/makefile.gcc        Sun Jun 18 16:09:55 2006
+@@ -1,9 +1,9 @@
+ PROG = lzma
+ CXX = g++ -O2 -Wall
+-CXX_C = gcc -O2 -Wall
++CXX_C = $(CC) -O2 -Wall
+ LIB = -lm
+ RM = rm -f
+-CFLAGS = -c -I ../../../
++CFLAGSX = $(CFLAGS) -c -I ../../../
+ 
+ OBJS = \
+   LzmaAlone.o \
+@@ -37,76 +37,76 @@ $(PROG): $(OBJS)
+        $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB)
+ 
+ LzmaAlone.o: LzmaAlone.cpp
+-       $(CXX) $(CFLAGS) LzmaAlone.cpp
++       $(CXX) $(CFLAGSX) LzmaAlone.cpp
+ 
+ LzmaBench.o: LzmaBench.cpp
+-       $(CXX) $(CFLAGS) LzmaBench.cpp
++       $(CXX) $(CFLAGSX) LzmaBench.cpp
+ 
+ LzmaRam.o: LzmaRam.cpp
+-       $(CXX) $(CFLAGS) LzmaRam.cpp
++       $(CXX) $(CFLAGSX) LzmaRam.cpp
+ 
+ LzmaRamDecode.o: LzmaRamDecode.c
+-       $(CXX_C) $(CFLAGS) LzmaRamDecode.c
++       $(CXX_C) $(CFLAGSX) LzmaRamDecode.c
+ 
+ LzmaDecode.o: ../LZMA_C/LzmaDecode.c
+-       $(CXX_C) $(CFLAGS) ../LZMA_C/LzmaDecode.c
++       $(CXX_C) $(CFLAGSX) ../LZMA_C/LzmaDecode.c
+ 
+ BranchX86.o: ../Branch/BranchX86.c
+-       $(CXX_C) $(CFLAGS) ../Branch/BranchX86.c
++       $(CXX_C) $(CFLAGSX) ../Branch/BranchX86.c
+ 
+ LZMADecoder.o: ../LZMA/LZMADecoder.cpp
+-       $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
++       $(CXX) $(CFLAGSX) ../LZMA/LZMADecoder.cpp
+ 
+ LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
+-       $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
++       $(CXX) $(CFLAGSX) ../LZMA/LZMAEncoder.cpp
+ 
+ LZInWindow.o: ../LZ/LZInWindow.cpp
+-       $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
++       $(CXX) $(CFLAGSX) ../LZ/LZInWindow.cpp
+ 
+ LZOutWindow.o: ../LZ/LZOutWindow.cpp
+-       $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
++       $(CXX) $(CFLAGSX) ../LZ/LZOutWindow.cpp
+ 
+ RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
+-       $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
++       $(CXX) $(CFLAGSX) ../RangeCoder/RangeCoderBit.cpp
+ 
+ InBuffer.o: ../../Common/InBuffer.cpp
+-       $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
++       $(CXX) $(CFLAGSX) ../../Common/InBuffer.cpp
+ 
+ OutBuffer.o: ../../Common/OutBuffer.cpp
+-       $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
++       $(CXX) $(CFLAGSX) ../../Common/OutBuffer.cpp
+ 
+ FileStreams.o: ../../Common/FileStreams.cpp
+-       $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
++       $(CXX) $(CFLAGSX) ../../Common/FileStreams.cpp
+ 
+ StreamUtils.o: ../../Common/StreamUtils.cpp
+-       $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
++       $(CXX) $(CFLAGSX) ../../Common/StreamUtils.cpp
+ 
+ Alloc.o: ../../../Common/Alloc.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/Alloc.cpp
+ 
+ C_FileIO.o: ../../../Common/C_FileIO.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/C_FileIO.cpp
+ 
+ CommandLineParser.o: ../../../Common/CommandLineParser.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/CommandLineParser.cpp
+ 
+ CRC.o: ../../../Common/CRC.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/CRC.cpp
+ 
+ MyWindows.o: ../../../Common/MyWindows.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/MyWindows.cpp
+ 
+ String.o: ../../../Common/String.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/String.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/String.cpp
+ 
+ StringConvert.o: ../../../Common/StringConvert.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/StringConvert.cpp
+ 
+ StringToInt.o: ../../../Common/StringToInt.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/StringToInt.cpp
+ 
+ Vector.o: ../../../Common/Vector.cpp
+-       $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
++       $(CXX) $(CFLAGSX) ../../../Common/Vector.cpp
+ 
+ clean:
+        -$(RM) $(PROG) $(OBJS)