diff options
| author | Ismael Luceno | 2021-04-23 19:24:22 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2021-04-23 19:42:49 +0200 |
| commit | 3dd6f0747e5cd8704142bcb985e26cb053c6c90b (patch) | |
| tree | 449362e76c0aac9d8f1d736c7b436cefca4f5984 /disk | |
| parent | f8e4ae97eb0f6b1ce7442d831bc01536960cace5 (diff) | |
squashfs-tools: Fix dependencies
Diffstat (limited to 'disk')
| -rwxr-xr-x | disk/squashfs-tools/BUILD | 12 | ||||
| -rwxr-xr-x | disk/squashfs-tools/DEPENDS | 12 | ||||
| -rw-r--r-- | disk/squashfs-tools/HISTORY | 5 |
3 files changed, 11 insertions, 18 deletions
diff --git a/disk/squashfs-tools/BUILD b/disk/squashfs-tools/BUILD index 275717a899..81e429ab2c 100755 --- a/disk/squashfs-tools/BUILD +++ b/disk/squashfs-tools/BUILD @@ -1,13 +1,3 @@ CFLAGS+=' -fcommon' && cd squashfs-tools && -if [[ "$SQUASHFS_LZMA" == "y" ]]; then - sedit "s/#XZ_SUPPORT/XZ_SUPPORT/" Makefile -fi && -if [[ "$SQUASHFS_LZO" == "y" ]]; then - sedit "s/#LZO_SUPPORT/LZO_SUPPORT/" Makefile && - sedit "s:#LZO_DIR = /usr/local:LZO_DIR = /usr:" Makefile -fi && - -make - - +make $OPTS diff --git a/disk/squashfs-tools/DEPENDS b/disk/squashfs-tools/DEPENDS index 695ab9d6a2..3a77c82fbf 100755 --- a/disk/squashfs-tools/DEPENDS +++ b/disk/squashfs-tools/DEPENDS @@ -1,6 +1,6 @@ -if [[ "$SQUASHFS_LZMA" == "y" ]]; then - depends LZMA -fi && -if [[ "$SQUASHFS_LZO" == "y" ]]; then - depends lzo -fi +# TODO zlib could be made optional too (GZIP_SUPPORT+COMP_DEFAULT) +depends zlib && +optional_depends LZMA XZ_SUPPORT={1,} 'for LZMA/XZ compression support' && +optional_depends lz4 LZ4_SUPPORT={1,} 'for LZ4 compression support' && +optional_depends lzo LZO_SUPPORT={1,} 'for LZO compression support' && +optional_depends zstd ZSTD_SUPPORT={1,} 'for Zstandard compression support' diff --git a/disk/squashfs-tools/HISTORY b/disk/squashfs-tools/HISTORY index 3ac52e3061..e093daf0c4 100644 --- a/disk/squashfs-tools/HISTORY +++ b/disk/squashfs-tools/HISTORY @@ -1,6 +1,9 @@ 2021-04-23 Ismael Luceno <ismael@sourcemage.org> * BUILD, DETAILS: updated spell to 4.4 - * PRE_BUILD: removed, no longer needed + * CONFIGURE, PRE_BUILD: removed, no longer needed + * BUILD: removed unnecessary edits to the Makefile + * DEPENDS: converted configs into optional dependencies + added missing dependencies 2019-02-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.3 |