From ef9e17df1b1558d4e3740a48e29af567b612ecb9 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Mon, 15 Apr 2024 14:05:10 -0700 Subject: [PATCH 1/4] new package libarchive --- cross/libarchive/Makefile | 21 +++++++++++++++++++++ cross/libarchive/PLIST | 7 +++++++ cross/libarchive/digests | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 cross/libarchive/Makefile create mode 100644 cross/libarchive/PLIST create mode 100644 cross/libarchive/digests diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile new file mode 100644 index 00000000000..722ad8004ec --- /dev/null +++ b/cross/libarchive/Makefile @@ -0,0 +1,21 @@ +PKG_NAME = libarchive +PKG_VERS = 3.7.3 + +PKG_DIST_SITE = https://github.com/libarchive/libarchive/archive +PKG_EXT = tar.gz +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +COMMENT = Multi-format archive and compression library +HOMEPAGE = https://www.libarchive.org/ +#LICENSE = https://github.com/libarchive/libarchive/blob/master/COPYING + +BUILD_DEPENDS = cross/openssl3 + +PRE_CONFIGURE_TARGET = libarchive_pre_configure + +include ../../mk/spksrc.cross-cc.mk + +.PHONY: libarchive_pre_configure +libarchive_pre_configure: + $(RUN) build/autogen.sh diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST new file mode 100644 index 00000000000..8e3b0ad75d9 --- /dev/null +++ b/cross/libarchive/PLIST @@ -0,0 +1,7 @@ +bin:bin/bsdcat +bin:bin/bsdcpio +bin:bin/bsdtar +bin:bin/bsdunzip +lib:lib/libarchive.so +lib:lib/libarchive.so.13 +lib:lib/libarchive.so.13.7.3 diff --git a/cross/libarchive/digests b/cross/libarchive/digests new file mode 100644 index 00000000000..cdb15d4b5bb --- /dev/null +++ b/cross/libarchive/digests @@ -0,0 +1,3 @@ +v3.7.3.tar.gz SHA1 9a68d48cc805f09da6640af06fe68cb4ff330a06 +v3.7.3.tar.gz SHA256 7c03c1102e081408778d0ca4dbd9083ba4f82fe7ac6b29e9fe3cc9a62f329f2a +v3.7.3.tar.gz MD5 28af2de59fe960027a1db597c2aa9415 From 8a10f995c72a0baca95c1ccf6d61d21b10636d5a Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Mon, 15 Apr 2024 14:44:52 -0700 Subject: [PATCH 2/4] First pass at spk build - also fix license --- cross/libarchive/Makefile | 2 +- spk/libarchive/Makefile | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 spk/libarchive/Makefile diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 722ad8004ec..2aa4763bfad 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -8,7 +8,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ -#LICENSE = https://github.com/libarchive/libarchive/blob/master/COPYING +LICENSE = 3-Clause BSD BUILD_DEPENDS = cross/openssl3 diff --git a/spk/libarchive/Makefile b/spk/libarchive/Makefile new file mode 100644 index 00000000000..52e53e9ed31 --- /dev/null +++ b/spk/libarchive/Makefile @@ -0,0 +1,19 @@ +SPK_NAME = libarchive +SPK_VERS = 3.7.3 +SPK_REV = 0 +#SPK_ICON = src/libarchive.png + +#DISPLAY_NAME = libarchive +DESCRIPTION = Multi-format archive and compression library +HOMEPAGE = https://www.libarchive.org/ +LICENSE = 3-Clause BSD +MAINTAINER = dotysan + +DEPENDS = cross/$(SPK_NAME) +STARTABLE = no +#REQUIRED_MIN_DSM = 7.0 +#UNSUPPORTED_ARCHS = comcerto2k +# do we need to symlink in the bin stuff? +#SPK_COMMANDS = bin/gpac bin/MP4Box + +include ../../mk/spksrc.spk.mk From cc8bb2d98ed2ea2f221ba58978d245a7bd189025 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 12:28:56 -0700 Subject: [PATCH 3/4] libarchive is not a pkg but just a depdendency - build from pre-configured tarball instead of raw source - which seems to support GNU configure - libcrytpo is runtime dependency - don't include bsd* cli; just shared object only --- cross/libarchive/Makefile | 14 +++++--------- cross/libarchive/PLIST | 4 ---- cross/libarchive/digests | 6 +++--- spk/libarchive/Makefile | 19 ------------------- 4 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 spk/libarchive/Makefile diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 2aa4763bfad..19ed0b2bed3 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -1,21 +1,17 @@ PKG_NAME = libarchive PKG_VERS = 3.7.3 -PKG_DIST_SITE = https://github.com/libarchive/libarchive/archive -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/libarchive/$(PKG_NAME)/releases/download/v$(PKG_VERS) +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD -BUILD_DEPENDS = cross/openssl3 +DEPENDS = cross/openssl3 -PRE_CONFIGURE_TARGET = libarchive_pre_configure +GNU_CONFIGURE = 1 include ../../mk/spksrc.cross-cc.mk - -.PHONY: libarchive_pre_configure -libarchive_pre_configure: - $(RUN) build/autogen.sh diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST index 8e3b0ad75d9..97c2b76763e 100644 --- a/cross/libarchive/PLIST +++ b/cross/libarchive/PLIST @@ -1,7 +1,3 @@ -bin:bin/bsdcat -bin:bin/bsdcpio -bin:bin/bsdtar -bin:bin/bsdunzip lib:lib/libarchive.so lib:lib/libarchive.so.13 lib:lib/libarchive.so.13.7.3 diff --git a/cross/libarchive/digests b/cross/libarchive/digests index cdb15d4b5bb..fac4ca6679d 100644 --- a/cross/libarchive/digests +++ b/cross/libarchive/digests @@ -1,3 +1,3 @@ -v3.7.3.tar.gz SHA1 9a68d48cc805f09da6640af06fe68cb4ff330a06 -v3.7.3.tar.gz SHA256 7c03c1102e081408778d0ca4dbd9083ba4f82fe7ac6b29e9fe3cc9a62f329f2a -v3.7.3.tar.gz MD5 28af2de59fe960027a1db597c2aa9415 +libarchive-3.7.3.tar.xz SHA1 67d722171cc3552ecd7fccd05934e8de4596c02b +libarchive-3.7.3.tar.xz SHA256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2 +libarchive-3.7.3.tar.xz MD5 b60683739a16ff6f00f32aa3516402ed diff --git a/spk/libarchive/Makefile b/spk/libarchive/Makefile deleted file mode 100644 index 52e53e9ed31..00000000000 --- a/spk/libarchive/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -SPK_NAME = libarchive -SPK_VERS = 3.7.3 -SPK_REV = 0 -#SPK_ICON = src/libarchive.png - -#DISPLAY_NAME = libarchive -DESCRIPTION = Multi-format archive and compression library -HOMEPAGE = https://www.libarchive.org/ -LICENSE = 3-Clause BSD -MAINTAINER = dotysan - -DEPENDS = cross/$(SPK_NAME) -STARTABLE = no -#REQUIRED_MIN_DSM = 7.0 -#UNSUPPORTED_ARCHS = comcerto2k -# do we need to symlink in the bin stuff? -#SPK_COMMANDS = bin/gpac bin/MP4Box - -include ../../mk/spksrc.spk.mk From 65cb7eb599e9fb0ae54238cf4ea8f6a28573b81e Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 15:42:06 -0700 Subject: [PATCH 4/4] Disable iconv for libarchive I have no idea why. But spk/synocli-file would not build pixz. However, cross/libarchive and diyspk/pigz both built standalone just fine. Also documenting some other strange and no-determininistic artifacts linked to build enviornment. --- cross/libarchive/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 19ed0b2bed3..8de33b7028c 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -10,8 +10,18 @@ COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD +# why does it still use only system autoconf?!? +#BUILD_DEPENDS = cross/autoconf + +# why does this still crash building synocli-file with pixz?!? +#BUILD_DEPENDS = cross/iconv +# or +#BUILD_DEPENDS = cross/libiconv +# above does nothing, must disable iconv below + DEPENDS = cross/openssl3 GNU_CONFIGURE = 1 +CONFIGURE_ARGS += --without-iconv include ../../mk/spksrc.cross-cc.mk