diff --git a/cross/fd_8.7.0/Makefile b/cross/fd_8.7.0/Makefile deleted file mode 100644 index f11206a19b4..00000000000 --- a/cross/fd_8.7.0/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -PKG_NAME = fd -PKG_VERS = 8.7.0 -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/sharkdp/fd/archive -PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS) -# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1 - we use rust version 1.77.2 for ARMv5 (but not for hi3535 anymore) -# see: https://github.com/sharkdp/fd/issues/1428 - -# powerpc archs (except qoriq) are not supported -# undefined reference to 'pipe2' -UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS) - -include ../../mk/spksrc.archs.mk -# issue with ARMv5: https://github.com/sharkdp/fd/issues/1049#issue-1283491635 -# workaround for: https://github.com/rust-lang/compiler-builtins/issues/420 -# fix documented in comment: https://github.com/rust-lang/compiler-builtins/issues/420#issuecomment-1335159456 -ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) -ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" -endif - -HOMEPAGE = https://github.com/sharkdp/fd -COMMENT = fd is a program to find entries in your filesystem. It is a simple, fast and user-friendly alternative to find. While it does not aim to support all of find's powerful functionality, it provides sensible (opinionated) defaults for a majority of use cases. -LICENSE = Apache 2.0 / MIT - -include ../../mk/spksrc.cross-rust.mk diff --git a/cross/fd_8.7.0/PLIST b/cross/fd_8.7.0/PLIST deleted file mode 100644 index edc78231755..00000000000 --- a/cross/fd_8.7.0/PLIST +++ /dev/null @@ -1 +0,0 @@ -bin:bin/fd diff --git a/cross/fd_8.7.0/digests b/cross/fd_8.7.0/digests deleted file mode 100644 index 8217ca1b2d7..00000000000 --- a/cross/fd_8.7.0/digests +++ /dev/null @@ -1,3 +0,0 @@ -fd-8.7.0.tar.gz SHA1 258ad4bc76758da1fe6a88777caae11eade2e95b -fd-8.7.0.tar.gz SHA256 13da15f3197d58a54768aaad0099c80ad2e9756dd1b0c7df68c413ad2d5238c9 -fd-8.7.0.tar.gz MD5 053987b4ff53af8fb9b05affd0cfa011 diff --git a/diyspk/fd/Makefile b/diyspk/fd/Makefile index 0cf47d0561a..267deb1acf9 100644 --- a/diyspk/fd/Makefile +++ b/diyspk/fd/Makefile @@ -5,6 +5,8 @@ SPK_REV = 1 DEPENDS = cross/fd UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) +# fd 8.7.0 with rust 1.77.2: use of deprecated method `chrono::TimeZone::datetime_from_str +UNSUPPORTED_ARCHS += $(ARMv5_ARCHS) # we can't no longer downgrade to rust 1.77.2 for ARMv7L to build fd 8.7.0 UNSUPPORTED_ARCHS += $(ARMv7L_ARCHS) diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index 6a3be1a317c..dfdb9de44d2 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -81,7 +81,7 @@ DEPENDS += cross/eza OPTIONAL_DESC := $(OPTIONAL_DESC)", eza" DEPENDS += cross/ripgrep OPTIONAL_DESC := $(OPTIONAL_DESC)", rg (ripgrep)" -ifneq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH)) +ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS)),$(ARCH)) DEPENDS += cross/fd OPTIONAL_DESC := $(OPTIONAL_DESC)", fd (fd-find)" endif @@ -110,7 +110,7 @@ DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: detox, iconv, dos2unix tools, \ patch$(OPTIONAL_DESC)." STARTABLE = no -CHANGELOG = "1. Remove fd (fd-find) for VS and NVR models (ARMv7L archs).
" +CHANGELOG = "1. Remove fd (fd-find) v8.7.0 used for VS and NVR models (ARMv7L archs) and for ARMv5 archs.
" CHANGELOG += "2. Update eza to v0.20.15.
" CHANGELOG += "3. Update file to v5.46.
" CHANGELOG += "4. Update fzf to v0.57.0.
"