OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

92 lines
2.7 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../squashfs-tools/squashfs-tools-4.1-Makefile.patch.disabled
  5. # Copyright (C) 2010 - 2011 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. diff -ruNpP squashfs4.1-orig/squashfs-tools/Makefile squashfs4.1/squashfs-tools/Makefile
  17. --- squashfs4.1-orig/squashfs-tools/Makefile 2010-09-21 00:11:47.000000000 +0200
  18. +++ squashfs4.1/squashfs-tools/Makefile 2010-10-01 16:02:07.920000826 +0200
  19. @@ -91,7 +91,7 @@ CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BI
  20. -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall
  21. LIBS =
  22. -ifdef GZIP_SUPPORT
  23. +ifeq ($(GZIP_SUPPORT),1)
  24. CFLAGS += -DGZIP_SUPPORT
  25. MKSQUASHFS_OBJS += gzip_wrapper.o
  26. UNSQUASHFS_OBJS += gzip_wrapper.o
  27. @@ -99,7 +99,7 @@ LIBS += -lz
  28. COMPRESSORS += gzip
  29. endif
  30. -ifdef LZMA_SUPPORT
  31. +ifeq ($(LZMA_SUPPORT),1)
  32. LZMA_OBJS = $(LZMA_DIR)/C/Alloc.o $(LZMA_DIR)/C/LzFind.o \
  33. $(LZMA_DIR)/C/LzmaDec.o $(LZMA_DIR)/C/LzmaEnc.o $(LZMA_DIR)/C/LzmaLib.o
  34. INCLUDEDIR += -I$(LZMA_DIR)/C
  35. @@ -109,7 +109,7 @@ UNSQUASHFS_OBJS += lzma_wrapper.o $(LZMA
  36. COMPRESSORS += lzma
  37. endif
  38. -ifdef XZ_SUPPORT
  39. +ifeq ($(XZ_SUPPORT),1)
  40. CFLAGS += -DLZMA_SUPPORT
  41. MKSQUASHFS_OBJS += xz_wrapper.o
  42. UNSQUASHFS_OBJS += xz_wrapper.o
  43. @@ -117,20 +117,22 @@ LIBS += -llzma
  44. COMPRESSORS += lzma
  45. endif
  46. -ifdef LZO_SUPPORT
  47. +ifeq ($(LZO_SUPPORT),1)
  48. CFLAGS += -DLZO_SUPPORT
  49. ifdef LZO_DIR
  50. INCLUDEDIR += -I$(LZO_DIR)/include
  51. +ifndef LZO_LIBDIR
  52. LZO_LIBDIR = -L$(LZO_DIR)/lib
  53. endif
  54. +endif
  55. MKSQUASHFS_OBJS += lzo_wrapper.o
  56. UNSQUASHFS_OBJS += lzo_wrapper.o
  57. LIBS += $(LZO_LIBDIR) -llzo2
  58. COMPRESSORS += lzo
  59. endif
  60. -ifdef XATTR_SUPPORT
  61. -ifdef XATTR_DEFAULT
  62. +ifeq ($(XATTR_SUPPORT),1)
  63. +ifeq ($(XATTR_DEFAULT),1)
  64. CFLAGS += -DXATTR_SUPPORT -DXATTR_DEFAULT
  65. else
  66. CFLAGS += -DXATTR_SUPPORT
  67. @@ -142,7 +144,7 @@ endif
  68. #
  69. # If LZMA_SUPPORT is specified then LZO_DIR must be specified too
  70. #
  71. -ifdef LZMA_SUPPORT
  72. +ifeq ($(LZMA_SUPPORT),1)
  73. ifndef LZMA_DIR
  74. $(error "LZMA_SUPPORT requires LZMA_DIR to be also defined")
  75. endif
  76. @@ -151,8 +153,8 @@ endif
  77. #
  78. # Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified
  79. #
  80. -ifdef XZ_SUPPORT
  81. -ifdef LZMA_SUPPORT
  82. +ifeq ($(XZ_SUPPORT),1)
  83. +ifeq ($(LZMA_SUPPORT),1)
  84. $(error "Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified")
  85. endif
  86. endif