Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

synocli-file: update tools and remove fd-find for hi3535 #6372

Merged
merged 3 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cross/bat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
DEPENDS = cross/zlib

UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
# package `home v0.5.11` cannot be built because it requires rustc 1.81 or newer, while the latest supported rustc version is 1.77.2
# a build with rustc 1.83.0 fails with:
# /rustc/90b35a6239c3d8bdabc530a6a0816f7ff89a0aaf/library/std/src/sys/pal/unix/stack_overflow.rs:270: undefined reference to `getauxval'
UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)

HOMEPAGE = https://github.com/sharkdp/bat
COMMENT = A cat(1) clone with wings.
Expand Down
2 changes: 1 addition & 1 deletion cross/eza/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = eza
PKG_VERS = 0.20.7
PKG_VERS = 0.20.15
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/eza-community/eza/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/eza/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
eza-0.20.7.tar.gz SHA1 777e3d547424c18f075cb263d87759054ae6dc69
eza-0.20.7.tar.gz SHA256 981af52e7a0d5ab374ed2a58b0bb9542acc81235ff479bb1f08d61941f65b18b
eza-0.20.7.tar.gz MD5 90e36737da120d84b6a999526e0d81fa
eza-0.20.15.tar.gz SHA1 17d5343e82713ec933b0e4988adf8b5bedce0375
eza-0.20.15.tar.gz SHA256 cbb50e61b35b06ccf487ee6cc88d3b624931093546194dd5a2bbd509ed1786d6
eza-0.20.15.tar.gz MD5 29d640f75265e7327bd67a21202eaef0
13 changes: 2 additions & 11 deletions cross/fd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,15 @@ 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 >= 9 still fails for$(ARMv7L_ARCHS)
# 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
# see: https://github.com/sharkdp/fd/issues/1428
# we can no longer downgrade to rust 1.77.2 for ARMv7L to build fd 8.7.0
UNSUPPORTED_ARCHS = $(ARMv7L_ARCHS)
# powerpc archs (except qoriq) are not supported
# undefined reference to 'pipe2'
UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS)

include ../../mk/spksrc.archs.mk
# This is still an issue with rustc 1.77.2 (25ef9e3d8 2024-04-09):
# 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
Expand Down
29 changes: 0 additions & 29 deletions cross/fd_8.7.0/Makefile

This file was deleted.

1 change: 0 additions & 1 deletion cross/fd_8.7.0/PLIST

This file was deleted.

3 changes: 0 additions & 3 deletions cross/fd_8.7.0/digests

This file was deleted.

31 changes: 0 additions & 31 deletions cross/fd_9.0.0/Makefile

This file was deleted.

1 change: 0 additions & 1 deletion cross/fd_9.0.0/PLIST

This file was deleted.

3 changes: 0 additions & 3 deletions cross/fd_9.0.0/digests

This file was deleted.

2 changes: 1 addition & 1 deletion cross/file/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = file
PKG_VERS = 5.45
PKG_VERS = 5.46
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://ftp.astron.com/pub/file
Expand Down
6 changes: 3 additions & 3 deletions cross/file/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
file-5.45.tar.gz SHA1 e8ee39339e5d3d68b7da9c45580f2ca5faf0db54
file-5.45.tar.gz SHA256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82
file-5.45.tar.gz MD5 26b2a96d4e3a8938827a1e572afd527a
file-5.46.tar.gz SHA1 af74daeac411a665b071a71ec89d3a3020647309
file-5.46.tar.gz SHA256 c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088
file-5.46.tar.gz MD5 459da2d4b534801e2e2861611d823864
2 changes: 1 addition & 1 deletion cross/fzf/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = fzf
PKG_VERS = 0.56.0
PKG_VERS = 0.57.0
PKG_EXT = tar.gz
PKG_REVISION = $(shell date +%m/%d/%Y)
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
Expand Down
6 changes: 3 additions & 3 deletions cross/fzf/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fzf-0.56.0.tar.gz SHA1 9b577eb9fc1192a65048230cdc4ef54fcd8320d3
fzf-0.56.0.tar.gz SHA256 45880ac4175535bf1b298598fbc404ae8ad455ebde804ed5336237759507dc76
fzf-0.56.0.tar.gz MD5 79d5d8ab724fabd52a3e9ac5a152e0dd
fzf-0.57.0.tar.gz SHA1 5c15a21083621fc2629ed7b483328810d75f9f8b
fzf-0.57.0.tar.gz SHA256 d4e8e25fad2d3f75943b403c40b61326db74b705bf629c279978fdd0ceb1f97c
fzf-0.57.0.tar.gz MD5 a90a9212ec21aeab508d9618c83bd9f8
2 changes: 1 addition & 1 deletion cross/nano/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = nano
PKG_VERS = 8.2
PKG_VERS = 8.3
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.nano-editor.org/dist/v$(firstword $(subst ., ,$(PKG_VERS)))
Expand Down
6 changes: 3 additions & 3 deletions cross/nano/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nano-8.2.tar.xz SHA1 33bc9c6bc8f84a8d551fd9d118a3495db5f419c7
nano-8.2.tar.xz SHA256 d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb
nano-8.2.tar.xz MD5 382baf871963ac2c31c1e8043c70776e
nano-8.3.tar.xz SHA1 91b2cfc2d04a69b4f0ea46cfc4f789f257f70a18
nano-8.3.tar.xz SHA256 551b717b2e28f7e90f749323686a1b5bbbd84cfa1390604d854a3ca3778f111e
nano-8.3.tar.xz MD5 e64276780e23efb273480c4279050f74
27 changes: 3 additions & 24 deletions cross/nnn/Makefile
Original file line number Diff line number Diff line change
@@ -1,35 +1,14 @@
PKG_NAME = nnn
PKG_VERS = 4.8
PKG_VERS = 5.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# REMARKS:
# currently stay on version 4.8
# versions 4.9 and 5.0 fail with the following error for all DSM 6 (even 64 bit):
# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
# we will have to decide whether we
# - fall back to version 4.0 for all packages with DSM < 7
# - keep nnn version 4.8 for DSM 6 and x64, x86 and aarch64
# - patch version > 4.8 for DSM 6 and x64, x86 and aarch64 to remove the definition of _FILE_OFFSET_BITS==64
# (we would have to verify that 64 bit/largefile support is working when built without -D_FILE_OFFSET_BITS==64)
#

DEPENDS = cross/ncursesw cross/readline

# compiler too old (-std=c11 required)
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)

# 32 bit archs require DSM >= 7
# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
include ../../mk/spksrc.common.mk
ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
UNSUPPORTED_ARCHS += $(32bit_ARCHS)
else
# comcerto2k is not even supported on DSM>=7
UNSUPPORTED_ARCHS += comcerto2k
endif
REQUIRED_MIN_DSM = 7
UNSUPPORTED_ARCHS = comcerto2k

HOMEPAGE = https://github.com/jarun/nnn
COMMENT = n³ The unorthodox terminal file manager.
Expand Down
6 changes: 3 additions & 3 deletions cross/nnn/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nnn-v4.8.tar.gz SHA1 b00433baab8ea3777c237f7e7b61064dd750ae03
nnn-v4.8.tar.gz SHA256 7027f830329ff3451b844d1f5fbeb1d866bed1af6f24a360d5c51888cb1ae8f0
nnn-v4.8.tar.gz MD5 c87c132342b1ca0ce8f2b051bb67c832
nnn-v5.0.tar.gz SHA1 f0f33436942ad99d37bb458618e1b6a80cd61159
nnn-v5.0.tar.gz SHA256 ba82d6c685bb3687521de2f576244f82558a4af9afeeedda434d5ecb1c029520
nnn-v5.0.tar.gz MD5 28b6afb4056c738a8c5a60d4b9d41941
4 changes: 2 additions & 2 deletions cross/nnn_4.0/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# PKG_VERS 4.0 is the latest version for DSM<7 and comcerto2k

# REMARKS:
# nnn version 4.0 is the latest version for 32-bit archs on DSM 6 and for comcerto2k
DEPENDS = cross/ncursesw cross/readline

# compiler too old (-std=c11 required)
Expand Down
41 changes: 41 additions & 0 deletions cross/nnn_4.8/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
PKG_NAME = nnn
PKG_VERS = 4.8
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# REMARKS:
# nnn version 4.0 is the latest version for 32-bit archs on DSM 6 and for comcerto2k
# nnn version 4.8 is the latest version for 64-bit archs on DSM 6
# later versions fail with the following error for all DSM 6 (even 64 bit):
# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"

# All DSM 6 toolchains (and DSM 7 of comcerto2k) have identical fts.h file (usr/inluce/fts.h) with this guard:
# /* The fts interface is incompatible with the LFS interface which
# transparently uses the 64-bit file access functions. */
# #ifdef __USE_FILE_OFFSET64
# # error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
# #endif

DEPENDS = cross/ncursesw cross/readline

# compiler too old (-std=c11 required)
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
# comcerto2k is not supported on DSM 6 and DSM 7
UNSUPPORTED_ARCHS += comcerto2k

# 32 bit archs require DSM >= 7
include ../../mk/spksrc.common.mk
ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
UNSUPPORTED_ARCHS += $(32bit_ARCHS)
endif

HOMEPAGE = https://github.com/jarun/nnn
COMMENT = n³ The unorthodox terminal file manager.
LICENSE = 2-clause BSD

CONFIGURE_TARGET = nop
INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)

include ../../mk/spksrc.cross-cc.mk
2 changes: 2 additions & 0 deletions cross/nnn_4.8/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bin:bin/nnn

3 changes: 3 additions & 0 deletions cross/nnn_4.8/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nnn-v4.8.tar.gz SHA1 b00433baab8ea3777c237f7e7b61064dd750ae03
nnn-v4.8.tar.gz SHA256 7027f830329ff3451b844d1f5fbeb1d866bed1af6f24a360d5c51888cb1ae8f0
nnn-v4.8.tar.gz MD5 c87c132342b1ca0ce8f2b051bb67c832
9 changes: 5 additions & 4 deletions cross/tree/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
PKG_NAME = tree
PKG_VERS = 2.1.3
PKG_VERS = 2.2.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://fossies.org/linux/misc
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/Old-Man-Programmer/tree/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = http://mama.indstate.edu/users/ice/tree/
HOMEPAGE = https://oldmanprogrammer.net/source.php?dir=projects/tree
COMMENT = Tree is a recursive directory listing command that produces a depth indented listing of files, which is colorized ala dircolors if the LS_COLORS environment variable is set and output is to tty.
LICENSE = GPLv2

Expand Down
6 changes: 3 additions & 3 deletions cross/tree/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tree-2.1.3.tar.gz SHA1 58ada247679751dd797cf30bdee7bc608d673a9d
tree-2.1.3.tar.gz SHA256 3ffe2c8bb21194b088ad1e723f0cf340dd434453c5ff9af6a38e0d47e0c2723b
tree-2.1.3.tar.gz MD5 e37b8b15a8d87801c35ffd82a619848f
tree-2.2.1.tar.gz SHA1 5eb45590d0289d31b8673aadc45549a85a3709af
tree-2.2.1.tar.gz SHA256 5caddcbca805131ff590b126d3218019882e4ca10bc9eb490bba51c05b9b3b75
tree-2.2.1.tar.gz MD5 e2815dfff9bd6b91e828ed5b17d8e36d
29 changes: 10 additions & 19 deletions cross/tree/patches/001-enable-cross-compiler-definitions.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
--- Makefile.orig 2024-07-09 22:41:41.000000000 +0000
+++ Makefile 2024-10-13 06:32:13.939839865 +0000
@@ -18,7 +18,7 @@
--- Makefile.orig 2024-11-26 00:55:17.000000000 +0000
+++ Makefile 2025-01-03 23:05:51.677704322 +0000
@@ -36,7 +36,7 @@
LDFLAGS?=-s
#CFLAGS?=-ggdb
CFLAGS?=-O3
-CFLAGS+=-std=c11 -Wpedantic -Wall -Wextra -Wstrict-prototypes -Wshadow -Wconversion
+#CFLAGS+=-std=c11 -Wpedantic -Wall -Wextra -Wstrict-prototypes -Wshadow -Wconversion
# _LARGEFILE64_SOURCE may be considered obsolete
CPPFLAGS+=-DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64

PREFIX=/usr/local

-CC=gcc
+#CC=gcc
INSTALL=install

VERSION=2.1.3
@@ -33,7 +33,7 @@

# Linux defaults:
#CFLAGS+=-ggdb -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+#CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
#LDFLAGS+=-s

# Uncomment for FreeBSD:
2 changes: 1 addition & 1 deletion diyspk/eza/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPK_NAME = eza
SPK_VERS = 0.20.7
SPK_VERS = 0.20.15
SPK_REV = 1

DEPENDS = cross/eza
Expand Down
15 changes: 4 additions & 11 deletions diyspk/fd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ 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)

MAINTAINER = SynoCommunity
DESCRIPTION = 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.
Expand All @@ -16,14 +20,3 @@ LICENSE = Apache 2.0 / MIT
SPK_COMMANDS = bin/fd

include ../../mk/spksrc.spk.mk

ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
DEPENDS += cross/fd_8.7.0
SPK_VERS = 8.7.0
else ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
DEPENDS += cross/fd_9.0.0
SPK_VERS = 9.0.0
else
DEPENDS += cross/fd
endif

2 changes: 1 addition & 1 deletion diyspk/file/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPK_NAME = file
SPK_VERS = 5.45
SPK_VERS = 5.46
SPK_REV = 1

DEPENDS = cross/file
Expand Down
6 changes: 4 additions & 2 deletions diyspk/fzf/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
SPK_NAME = fzf
SPK_VERS = 0.56.0
SPK_VERS = 0.57.0
SPK_REV = 1
SPK_ICON = src/fzf.png

DEPENDS = cross/fzf
DEPENDS = cross/fzf_update

UNSUPPORTED_ARCHS = $(PPC_ARCHS)

MAINTAINER = SynoCommunity
DESCRIPTION = A command-line fuzzy finder.
Expand Down
2 changes: 1 addition & 1 deletion diyspk/nano/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPK_NAME = nano
SPK_VERS = 8.2
SPK_VERS = 8.3
SPK_REV = 1
SPK_ICON = src/nano.png

Expand Down
Loading
Loading