squashfs-4.0-build-system-fix.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. Index: a/squashfs-tools/Makefile
  2. ===================================================================
  3. --- a/squashfs-tools.orig/Makefile 2009-04-19 01:47:43.000000000 +0200
  4. +++ b/squashfs-tools/Makefile 2009-04-19 01:52:36.000000000 +0200
  5. @@ -1,36 +1,48 @@
  6. INSTALL_DIR = /usr/local/bin
  7. INCLUDEDIR = .
  8. +CFLAGS_R = -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
  9. +LIBS = -lz -lpthread
  10. CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
  11. all: mksquashfs unsquashfs
  12. mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o
  13. - $(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@
  14. + $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@
  15. mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h Makefile
  16. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  17. read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h Makefile
  18. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  19. sort.o: sort.c squashfs_fs.h global.h sort.h Makefile
  20. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  21. swap.o: swap.c Makefile
  22. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  23. pseudo.o: pseudo.c pseudo.h Makefile
  24. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  25. unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o
  26. - $(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@
  27. + $(CC) $(LDFLAGS) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@
  28. -unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile
  29. +unsquashfs.o: unsquashfs.c unsquashfs.h squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile
  30. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  31. -unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h Makefile
  32. +unsquash-1.o: unsquash-1.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile
  33. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  34. -unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile
  35. +unsquash-2.o: unsquash-2.c unsquashfs.h unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile
  36. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  37. -unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h Makefile
  38. +unsquash-3.o: unsquash-3.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile
  39. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  40. -unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h Makefile
  41. +unsquash-4.o: unsquash-4.c unsquashfs.h squashfs_fs.h squashfs_swap.h global.h Makefile
  42. + $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<
  43. clean:
  44. -rm -f *.o mksquashfs unsquashfs