Changeset 3da2a55 in freewrt


Ignore:
Timestamp:
Jun 18, 2006, 6:26:39 PM (19 years ago)
Author:
Thorsten Glaser <tg@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
e413778
Parents:
732920b
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@

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@99 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • target/Makefile

    r732920b r3da2a55  
    66        mkdir -p $(BIN_DIR)
    77
    8 linux-compile: lzma-install
     8linux-compile:
    99linux-install: $(BIN_DIR)
    1010
    … …  
    1212compile: linux-compile
    1313install: image_clean linux-install
    14 clean: linux-clean lzma-clean image_clean
     14clean: linux-clean image_clean
    1515
    1616image_clean:

  • toolchain/Makefile

    r732920b r3da2a55  
    11# Main makefile for the toolchain
    22include $(TOPDIR)/rules.mk
    3 TARGETS:=sed binutils gcc uClibc ipkg-utils gdb libnotimpl utils
     3TARGETS:=sed binutils gcc uClibc ipkg-utils gdb libnotimpl utils lzma
    44
    55TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))

  • toolchain/lzma/lzma-zlib.patch

    r732920b r3da2a55  
     1$FreeWRT$
     2
    13diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp
    24--- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp   2005-09-22 10:55:34.000000000 +0200
    … …  
    4244+AR = ar
    4345+RM = rm -f
    44 +CFLAGS = -c  -I ../../../
     46+CFLAGSX = $(CFLAGS) -c  -I ../../../
    4547+
    4648+OBJS = \
    … …  
    7173+
    7274+ZLib.o: ZLib.cpp
    73 +       $(CXX) $(CFLAGS) ZLib.cpp
     75+       $(CXX) $(CFLAGSX) ZLib.cpp
    7476+
    7577+LZMADecoder.o: ../LZMA/LZMADecoder.cpp
    76 +       $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
     78+       $(CXX) $(CFLAGSX) ../LZMA/LZMADecoder.cpp
    7779+
    7880+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
    79 +       $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
     81+       $(CXX) $(CFLAGSX) ../LZMA/LZMAEncoder.cpp
    8082+
    8183+LZInWindow.o: ../LZ/LZInWindow.cpp
    82 +       $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
     84+       $(CXX) $(CFLAGSX) ../LZ/LZInWindow.cpp
    8385+
    8486+LZOutWindow.o: ../LZ/LZOutWindow.cpp
    85 +       $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
     87+       $(CXX) $(CFLAGSX) ../LZ/LZOutWindow.cpp
    8688+
    8789+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
    88 +       $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
     90+       $(CXX) $(CFLAGSX) ../RangeCoder/RangeCoderBit.cpp
    8991+
    9092+InBuffer.o: ../../Common/InBuffer.cpp
    91 +       $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
     93+       $(CXX) $(CFLAGSX) ../../Common/InBuffer.cpp
    9294+
    9395+OutBuffer.o: ../../Common/OutBuffer.cpp
    94 +       $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
     96+       $(CXX) $(CFLAGSX) ../../Common/OutBuffer.cpp
    9597+
    9698+StreamUtils.o: ../../Common/StreamUtils.cpp
    97 +       $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
     99+       $(CXX) $(CFLAGSX) ../../Common/StreamUtils.cpp
    98100+
    99101+FileStreams.o: ../../Common/FileStreams.cpp
    100 +       $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
     102+       $(CXX) $(CFLAGSX) ../../Common/FileStreams.cpp
    101103+
    102104+Alloc.o: ../../../Common/Alloc.cpp
    103 +       $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
     105+       $(CXX) $(CFLAGSX) ../../../Common/Alloc.cpp
    104106+
    105107+C_FileIO.o: ../../../Common/C_FileIO.cpp
    106 +       $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
     108+       $(CXX) $(CFLAGSX) ../../../Common/C_FileIO.cpp
    107109+
    108110+CommandLineParser.o: ../../../Common/CommandLineParser.cpp
    109 +       $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
     111+       $(CXX) $(CFLAGSX) ../../../Common/CommandLineParser.cpp
    110112+
    111113+CRC.o: ../../../Common/CRC.cpp
    112 +       $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
     114+       $(CXX) $(CFLAGSX) ../../../Common/CRC.cpp
    113115+
    114116+MyWindows.o: ../../../Common/MyWindows.cpp
    115 +       $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
     117+       $(CXX) $(CFLAGSX) ../../../Common/MyWindows.cpp
    116118+
    117119+String.o: ../../../Common/String.cpp
    118 +       $(CXX) $(CFLAGS) ../../../Common/String.cpp
     120+       $(CXX) $(CFLAGSX) ../../../Common/String.cpp
    119121+
    120122+StringConvert.o: ../../../Common/StringConvert.cpp
    121 +       $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
     123+       $(CXX) $(CFLAGSX) ../../../Common/StringConvert.cpp
    122124+
    123125+StringToInt.o: ../../../Common/StringToInt.cpp
    124 +       $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
     126+       $(CXX) $(CFLAGSX) ../../../Common/StringToInt.cpp
    125127+
    126128+Vector.o: ../../../Common/Vector.cpp
    127 +       $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
     129+       $(CXX) $(CFLAGSX) ../../../Common/Vector.cpp
    128130+
    129131+clean:
    … …  
    407409+       return Z_OK;
    408410+}
     411--- lzma/C/7zip/Compress/LZMA_Alone/makefile.gcc.orig   Sun Jun 18 16:09:23 2006
     412+++ lzma/C/7zip/Compress/LZMA_Alone/makefile.gcc        Sun Jun 18 16:09:55 2006
     413@@ -1,9 +1,9 @@
     414 PROG = lzma
     415 CXX = g++ -O2 -Wall
     416-CXX_C = gcc -O2 -Wall
     417+CXX_C = $(CC) -O2 -Wall
     418 LIB = -lm
     419 RM = rm -f
     420-CFLAGS = -c -I ../../../
     421+CFLAGSX = $(CFLAGS) -c -I ../../../
     422 
     423 OBJS = \
     424   LzmaAlone.o \
     425@@ -37,76 +37,76 @@ $(PROG): $(OBJS)
     426        $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB)
     427 
     428 LzmaAlone.o: LzmaAlone.cpp
     429-       $(CXX) $(CFLAGS) LzmaAlone.cpp
     430+       $(CXX) $(CFLAGSX) LzmaAlone.cpp
     431 
     432 LzmaBench.o: LzmaBench.cpp
     433-       $(CXX) $(CFLAGS) LzmaBench.cpp
     434+       $(CXX) $(CFLAGSX) LzmaBench.cpp
     435 
     436 LzmaRam.o: LzmaRam.cpp
     437-       $(CXX) $(CFLAGS) LzmaRam.cpp
     438+       $(CXX) $(CFLAGSX) LzmaRam.cpp
     439 
     440 LzmaRamDecode.o: LzmaRamDecode.c
     441-       $(CXX_C) $(CFLAGS) LzmaRamDecode.c
     442+       $(CXX_C) $(CFLAGSX) LzmaRamDecode.c
     443 
     444 LzmaDecode.o: ../LZMA_C/LzmaDecode.c
     445-       $(CXX_C) $(CFLAGS) ../LZMA_C/LzmaDecode.c
     446+       $(CXX_C) $(CFLAGSX) ../LZMA_C/LzmaDecode.c
     447 
     448 BranchX86.o: ../Branch/BranchX86.c
     449-       $(CXX_C) $(CFLAGS) ../Branch/BranchX86.c
     450+       $(CXX_C) $(CFLAGSX) ../Branch/BranchX86.c
     451 
     452 LZMADecoder.o: ../LZMA/LZMADecoder.cpp
     453-       $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
     454+       $(CXX) $(CFLAGSX) ../LZMA/LZMADecoder.cpp
     455 
     456 LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
     457-       $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
     458+       $(CXX) $(CFLAGSX) ../LZMA/LZMAEncoder.cpp
     459 
     460 LZInWindow.o: ../LZ/LZInWindow.cpp
     461-       $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
     462+       $(CXX) $(CFLAGSX) ../LZ/LZInWindow.cpp
     463 
     464 LZOutWindow.o: ../LZ/LZOutWindow.cpp
     465-       $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
     466+       $(CXX) $(CFLAGSX) ../LZ/LZOutWindow.cpp
     467 
     468 RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
     469-       $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
     470+       $(CXX) $(CFLAGSX) ../RangeCoder/RangeCoderBit.cpp
     471 
     472 InBuffer.o: ../../Common/InBuffer.cpp
     473-       $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
     474+       $(CXX) $(CFLAGSX) ../../Common/InBuffer.cpp
     475 
     476 OutBuffer.o: ../../Common/OutBuffer.cpp
     477-       $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
     478+       $(CXX) $(CFLAGSX) ../../Common/OutBuffer.cpp
     479 
     480 FileStreams.o: ../../Common/FileStreams.cpp
     481-       $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
     482+       $(CXX) $(CFLAGSX) ../../Common/FileStreams.cpp
     483 
     484 StreamUtils.o: ../../Common/StreamUtils.cpp
     485-       $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
     486+       $(CXX) $(CFLAGSX) ../../Common/StreamUtils.cpp
     487 
     488 Alloc.o: ../../../Common/Alloc.cpp
     489-       $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
     490+       $(CXX) $(CFLAGSX) ../../../Common/Alloc.cpp
     491 
     492 C_FileIO.o: ../../../Common/C_FileIO.cpp
     493-       $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
     494+       $(CXX) $(CFLAGSX) ../../../Common/C_FileIO.cpp
     495 
     496 CommandLineParser.o: ../../../Common/CommandLineParser.cpp
     497-       $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
     498+       $(CXX) $(CFLAGSX) ../../../Common/CommandLineParser.cpp
     499 
     500 CRC.o: ../../../Common/CRC.cpp
     501-       $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
     502+       $(CXX) $(CFLAGSX) ../../../Common/CRC.cpp
     503 
     504 MyWindows.o: ../../../Common/MyWindows.cpp
     505-       $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
     506+       $(CXX) $(CFLAGSX) ../../../Common/MyWindows.cpp
     507 
     508 String.o: ../../../Common/String.cpp
     509-       $(CXX) $(CFLAGS) ../../../Common/String.cpp
     510+       $(CXX) $(CFLAGSX) ../../../Common/String.cpp
     511 
     512 StringConvert.o: ../../../Common/StringConvert.cpp
     513-       $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
     514+       $(CXX) $(CFLAGSX) ../../../Common/StringConvert.cpp
     515 
     516 StringToInt.o: ../../../Common/StringToInt.cpp
     517-       $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
     518+       $(CXX) $(CFLAGSX) ../../../Common/StringToInt.cpp
     519 
     520 Vector.o: ../../../Common/Vector.cpp
     521-       $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
     522+       $(CXX) $(CFLAGSX) ../../../Common/Vector.cpp
     523 
     524 clean:
     525        -$(RM) $(PROG) $(OBJS)
Note: See TracChangeset for help on using the changeset viewer.