Changeset 5ff47d7 in freewrt for target/linux

Timestamp:

Jun 18, 2006, 9:41:34 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

292b5b5

Parents:

5b558a0

Message:

fix host-related build and CFLAGS abuse *sigh*
are the GNU/Linux people really this stupid?

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

Location:

target/linux/image/squashfs

Files:

• Makefile (modified) (1 diff)
• patches/100-lzma.patch (modified) (2 diffs)

target/linux/image/squashfs/Makefile

@@ -15 +15 @@
 
 $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked
-        $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(TOOL_BUILD_DIR)/lzma
+        $(MAKE) CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+            -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(TOOL_BUILD_DIR)/lzma
 
 $(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma

target/linux/image/squashfs/patches/100-lzma.patch

@@ -1 @@
-diff -Nur squashfs3.0/squashfs-tools/Makefile squashfs3.0-owrt/squashfs-tools/Makefile
---- squashfs3.0/squashfs-tools/Makefile 2006-03-15 22:36:20.000000000 +0100
-+++ squashfs3.0-owrt/squashfs-tools/Makefile    2006-03-21 11:14:08.000000000 +0100
-@@ -1,4 +1,5 @@
+$FreeWRT$
+
+        * build LZMA
+        * fix CFLAGS abuse
+
+--- squashfs3.0/squashfs-tools/Makefile.orig    Sun Jun 18 19:37:35 2006
++++ squashfs3.0/squashfs-tools/Makefile Sun Jun 18 19:38:08 2006
+@@ -1,6 +1,7 @@
  INCLUDEDIR = .
 +#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
  
- CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
+-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
++CPPFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  
-@@ -7,6 +8,9 @@
+ all: mksquashfs unsquashfs
+ 
+@@ -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 $@
@@ -18 +25 @@
  
  read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
-@@ -17,3 +21,5 @@
+@@ -17,3 +21,5 @@ unsquashfs: unsquashfs.o
         $(CC) unsquashfs.o -lz -o $@