tools/squashfs4: backport OpenWrt extended options patch

[openwrt/staging/nbd.git] / tools / squashfs4 / Makefile

diff --git a/tools/squashfs4/Makefile b/tools/squashfs4/Makefile
index e2c9fc91ccb9341f737907f4a58779b1235e3942..ce66a8558069cf3e6bec067cc7611fd1222a18a4 100644 (file)
--- a/tools/squashfs4/Makefile
+++ b/tools/squashfs4/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2012 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,24 +7,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squashfs4
-PKG_VERSION:=4.2
+PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
+PKG_VERSION:=4.6.1
+PKG_RELEASE=3
 
-PKG_SOURCE:=squashfs$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/squashfs
-PKG_HASH:=d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96
-PKG_CAT:=zcat
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools
+PKG_SOURCE_DATE:=2023-03-26
+PKG_SOURCE_VERSION:=d8cb82d9840330f9344ec37b992595b5d7b44184
+PKG_MIRROR_HASH:=fc625af657ca284d69fbc32e3bb572d0afd566cf816b7c1c1b66dda0a0c2760a
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/squashfs$(PKG_VERSION)
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
-               CC="$(HOSTCC)" \
+       +$(HOST_MAKE_VARS) \
+       $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/squashfs-tools \
                XZ_SUPPORT=1 \
                LZMA_XZ_SUPPORT=1 \
-               XATTR_SUPPORT= \
-               LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
+               XZ_EXTENDED_OPTIONS=1 \
                EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \
                mksquashfs unsquashfs
 endef