diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2018-12-12 16:10:42 +0100 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2019-02-28 01:38:46 +0100 |
| commit | 889b6423b78bcde8af81d68a3fabcdd019181de4 (patch) | |
| tree | 1855cb252ea7297bb74901a9955a33347512ebc0 /tools/squashfs4/patches/110-allow_static_liblzma.patch | |
| parent | 9e8cbecb7f188dcf31b3a4e268d8e2b8e6d55a58 (diff) | |
| download | upstream-889b6423b78bcde8af81d68a3fabcdd019181de4.tar.gz upstream-889b6423b78bcde8af81d68a3fabcdd019181de4.tar.bz2 upstream-889b6423b78bcde8af81d68a3fabcdd019181de4.zip | |
tools: migrate from squashfs4 to squashfskit4
squashfskit is a fork of the squashfs-tools.
squashfskit creates reproducible filesystems and includes
many of the distro patches.
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Tested-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'tools/squashfs4/patches/110-allow_static_liblzma.patch')
| -rw-r--r-- | tools/squashfs4/patches/110-allow_static_liblzma.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/tools/squashfs4/patches/110-allow_static_liblzma.patch b/tools/squashfs4/patches/110-allow_static_liblzma.patch deleted file mode 100644 index 9a3a744184..0000000000 --- a/tools/squashfs4/patches/110-allow_static_liblzma.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/squashfs-tools/Makefile -+++ b/squashfs-tools/Makefile -@@ -129,7 +129,6 @@ ifeq ($(LZMA_XZ_SUPPORT),1) - CFLAGS += -DLZMA_SUPPORT - MKSQUASHFS_OBJS += lzma_xz_wrapper.o - UNSQUASHFS_OBJS += lzma_xz_wrapper.o --LIBS += -llzma - COMPRESSORS += lzma - endif - -@@ -137,10 +136,18 @@ ifeq ($(XZ_SUPPORT),1) - CFLAGS += -DXZ_SUPPORT - MKSQUASHFS_OBJS += xz_wrapper.o - UNSQUASHFS_OBJS += xz_wrapper.o --LIBS += -llzma - COMPRESSORS += xz - endif - -+ifneq ($(LZMA_XZ_SUPPORT)$(XZ_SUPPORT),) -+ifneq ($(LZMA_LIB),) -+MKSQUASHFS_OBJS += $(LZMA_LIB) -+UNSQUASHFS_OBJS += $(LZMA_LIB) -+else -+LIBS += -llzma -+endif -+endif -+ - ifeq ($(LZO_SUPPORT),1) - CFLAGS += -DLZO_SUPPORT - ifdef LZO_DIR |