From a45d99a06e8974ac7d06ae34ec0e9a8fbcfa7afb Mon Sep 17 00:00:00 2001 From: hgy59 Date: Mon, 1 Apr 2024 07:51:20 +0200 Subject: [PATCH] Update zlib (#6052) * update zlib - update zlib to v1.3.1 - update zlib-ng to v2.1.6 - use zlib (not zlib-ng) for cross/bat (linker bug is fixed since 0c60c7e30623546e6807a382110d7bf428192e32) - revert zlib workaround in synocli-file/Makefile * lsd: define OLD_PPC_ARCHS as unsupported - the package synocli-file already excludes lsd for OLD_PPC_ARCHS * mc: adjust file list for v4.8.31 - latest update dropped support of native FISH server and protocol. --- cross/bat/Makefile | 2 +- cross/lsd/Makefile | 4 ++++ cross/mc/PLIST | 1 - cross/zlib-ng/Makefile | 3 +-- cross/zlib-ng/PLIST | 2 +- cross/zlib-ng/digests | 6 +++--- cross/zlib/Makefile | 7 +++---- cross/zlib/PLIST | 2 +- cross/zlib/digests | 6 +++--- diyspk/lsd/Makefile | 2 ++ spk/synocli-file/Makefile | 13 ++++--------- 11 files changed, 23 insertions(+), 25 deletions(-) diff --git a/cross/bat/Makefile b/cross/bat/Makefile index efcd7aade01..510a4d1ed35 100644 --- a/cross/bat/Makefile +++ b/cross/bat/Makefile @@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/sharkdp/bat/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/zlib-ng +DEPENDS = cross/zlib UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) diff --git a/cross/lsd/Makefile b/cross/lsd/Makefile index dd7407f83bf..d229af24d0b 100644 --- a/cross/lsd/Makefile +++ b/cross/lsd/Makefile @@ -8,6 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = +# even it compiles with native/rust-qoriq, the tool does not run +# on other PPC archs than qoriq (fails with "Segmentation fault (core dumped)") +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) + HOMEPAGE = https://github.com/lsd-rs/lsd COMMENT = The next gen ls command. LICENSE = Apache 2.0 diff --git a/cross/mc/PLIST b/cross/mc/PLIST index 9f92accadf6..f273e0b9d5b 100644 --- a/cross/mc/PLIST +++ b/cross/mc/PLIST @@ -6,7 +6,6 @@ rsc:etc/mc/ rsc:libexec/mc/cons.saver rsc:libexec/mc/ext.d/ rsc:libexec/mc/extfs.d/ -rsc:libexec/mc/fish/ rsc:libexec/mc/mc.csh rsc:libexec/mc/mc.sh rsc:libexec/mc/mc-wrapper.csh diff --git a/cross/zlib-ng/Makefile b/cross/zlib-ng/Makefile index 653bea3cefa..93ac7e3f502 100644 --- a/cross/zlib-ng/Makefile +++ b/cross/zlib-ng/Makefile @@ -1,5 +1,5 @@ PKG_NAME = zlib-ng -PKG_VERS = 2.1.4 +PKG_VERS = 2.1.6 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/zlib-ng/zlib-ng/archive @@ -10,7 +10,6 @@ DEPENDS = UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) - CMAKE_ARGS += -DZLIB_ENABLE_TESTS=OFF CMAKE_ARGS += -DZLIBNG_ENABLE_TESTS=OFF CMAKE_ARGS += -DWITH_GTEST=OFF diff --git a/cross/zlib-ng/PLIST b/cross/zlib-ng/PLIST index fd30c8cba97..8ecb4b1c64d 100644 --- a/cross/zlib-ng/PLIST +++ b/cross/zlib-ng/PLIST @@ -1,3 +1,3 @@ lnk:lib/libz-ng.so lnk:lib/libz-ng.so.2 -lib:lib/libz-ng.so.2.1.4 +lib:lib/libz-ng.so.2.1.6 diff --git a/cross/zlib-ng/digests b/cross/zlib-ng/digests index 6e651076f22..034614bb7d5 100644 --- a/cross/zlib-ng/digests +++ b/cross/zlib-ng/digests @@ -1,3 +1,3 @@ -zlib-ng-2.1.4.tar.gz SHA1 c28b365ff6e12acd92eb9d11244a96c6225a43df -zlib-ng-2.1.4.tar.gz SHA256 a0293475e6a44a3f6c045229fe50f69dc0eebc62a42405a51f19d46a5541e77a -zlib-ng-2.1.4.tar.gz MD5 d2ac0866850e3f80d5e4e509aab62438 +zlib-ng-2.1.6.tar.gz SHA1 e457ebf2d8aa6d59407fef848ca9b6df5f7a74e2 +zlib-ng-2.1.6.tar.gz SHA256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 +zlib-ng-2.1.6.tar.gz MD5 4854ab6a98d4b3d817b3e69ddbb148ce diff --git a/cross/zlib/Makefile b/cross/zlib/Makefile index 45bf8931337..f0a2cfbfbcf 100644 --- a/cross/zlib/Makefile +++ b/cross/zlib/Makefile @@ -1,5 +1,5 @@ PKG_NAME = zlib -PKG_VERS = 1.2.13 +PKG_VERS = 1.3.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://zlib.net/fossils @@ -13,9 +13,8 @@ LICENSE = zlib-license ADDITIONAL_CFLAGS = -Os -fPIC -# fix pkgconfig file -# build with cross-cc creates wrong pkgconfig file (prefix without missing package name) -# build with cross-cmake creates correct pkgconfig file, but default folder is share not lib +# create pkgconfig file in lib/pkgconfig (instead of share/pkgconfig) CMAKE_ARGS += -DINSTALL_PKGCONFIG_DIR=$(INSTALL_PREFIX)/lib/pkgconfig +CMAKE_ARGS += -DZLIB_BUILD_EXAMPLES=OFF include ../../mk/spksrc.cross-cmake.mk diff --git a/cross/zlib/PLIST b/cross/zlib/PLIST index 078b44c5e11..a3c3882d4d4 100644 --- a/cross/zlib/PLIST +++ b/cross/zlib/PLIST @@ -1,3 +1,3 @@ lnk:lib/libz.so lnk:lib/libz.so.1 -lib:lib/libz.so.1.2.13 +lib:lib/libz.so.1.3.1 diff --git a/cross/zlib/digests b/cross/zlib/digests index 80aad080d48..75d69add00a 100644 --- a/cross/zlib/digests +++ b/cross/zlib/digests @@ -1,3 +1,3 @@ -zlib-1.2.13.tar.gz SHA1 55eaa84906f31ac20d725aa26cd20839196b6ba6 -zlib-1.2.13.tar.gz SHA256 b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 -zlib-1.2.13.tar.gz MD5 9b8aa094c4e5765dabf4da391f00d15c +zlib-1.3.1.tar.gz SHA1 f535367b1a11e2f9ac3bec723fb007fbc0d189e5 +zlib-1.3.1.tar.gz SHA256 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 +zlib-1.3.1.tar.gz MD5 9855b6d802d7fe5b7bd5b196a2271655 diff --git a/diyspk/lsd/Makefile b/diyspk/lsd/Makefile index bc1428c1099..d9877e75b6b 100644 --- a/diyspk/lsd/Makefile +++ b/diyspk/lsd/Makefile @@ -4,6 +4,8 @@ SPK_REV = 1 DEPENDS = cross/lsd +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) + MAINTAINER = SynoCommunity DESCRIPTION = The next gen ls command. STARTABLE = no diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index 564a8b73a0e..d63cfc7ab90 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -3,7 +3,7 @@ SPK_VERS = 3.3 SPK_REV = 23 SPK_ICON = src/synocli-file.png -# packages depending on cross/zlib must be defined later, see below +# some package dependencies are defined later, see below (after rmlint) DEPENDS = cross/less cross/tree cross/ncdu cross/jdupes cross/rhash cross/nano cross/file DEPENDS += cross/detox DEPENDS += cross/lzip cross/plzip @@ -35,13 +35,6 @@ OPTIONAL_DESC = include ../../mk/spksrc.common.mk -ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) -# build rust tools before packages depending on cross/zlib -# These tools must use cross/zlib-ng instead of cross/zlib, otherwise will fail to find zlib (x64 only) -DEPENDS += cross/bat cross/eza -OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, eza" -endif - # PPC archs except QorIQ ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) # rmlint must be built before "cross/mc cross/pcre2 cross/fdupes cross/zstd" @@ -50,7 +43,7 @@ DEPENDS += cross/rmlint OPTIONAL_DESC := $(OPTIONAL_DESC)", rmlint" endif -# packages depending on cross/zlib +# Dependencies to be built after rmlint DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) @@ -78,6 +71,8 @@ endif # OLD_PPC archs are not supported with rust ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) +DEPENDS += cross/bat cross/eza +OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, eza" DEPENDS += cross/ripgrep OPTIONAL_DESC := $(OPTIONAL_DESC)", rg (ripgrep)" ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))