Skip to content

Commit

Permalink
synocli-file: update tools (#5897)
Browse files Browse the repository at this point in the history
* synocli-file: update tools
- Replace exa by eza v0.13.0 (#5895)
- Update dos2unix to v 7.5.1.
- Update file to v5.45. and add native/file to build independent of installed version (#5780)
- Update jdupes to v1.27.3.
- Update less to v643.
- Update Midnight Commander to v4.8.30.
- Update mg v3.7.
- Update ncdu to v1.19.
- Update rhash to v1.4.4.
- Update tree to v2.1.1.

* fix native/file
- works with static build only
- cleanup cross/file/Makefile

* further updates:
- Update fzf to v0.42.0
- Update micro to v2.0.12
- Update rmlint to v2.10.2
- avoid update of nnn to v4.9
  • Loading branch information
hgy59 authored Sep 23, 2023
1 parent aa1d088 commit 9ffe069
Show file tree
Hide file tree
Showing 58 changed files with 223 additions and 166 deletions.
5 changes: 2 additions & 3 deletions cross/bat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/zlib-ng

# unsupported by cross/zlib-ng
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)

HOMEPAGE = https://github.com/sharkdp/bat
COMMENT = A cat(1) clone with wings.
LICENSE = MIT or Apache 2.0
COMMENT = A cat(1) clone with wings.
LICENSE = MIT or Apache 2.0

include ../../mk/spksrc.cross-rust.mk
2 changes: 1 addition & 1 deletion cross/dos2unix/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = dos2unix
PKG_VERS = 7.5.0
PKG_VERS = 7.5.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://waterlan.home.xs4all.nl/dos2unix
Expand Down
6 changes: 3 additions & 3 deletions cross/dos2unix/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dos2unix-7.5.0.tar.gz SHA1 cc84af705ed9a5c4419b57784ee504c2af04c024
dos2unix-7.5.0.tar.gz SHA256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af
dos2unix-7.5.0.tar.gz MD5 001af2b16ae216241ac08bef29f36c28
dos2unix-7.5.1.tar.gz SHA1 231bcea3d5efc7addd66dd1ecd0c718c70fc6aae
dos2unix-7.5.1.tar.gz SHA256 da07788bb2e029b0d63f6471d166f68528acd8da2cf14823a188e8a9d5c1fc15
dos2unix-7.5.1.tar.gz MD5 8aef90aeae07b6ad9f8fc77e4eb12541
1 change: 0 additions & 1 deletion cross/exa/PLIST

This file was deleted.

3 changes: 0 additions & 3 deletions cross/exa/digests

This file was deleted.

11 changes: 5 additions & 6 deletions cross/exa/Makefile → cross/eza/Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
PKG_NAME = exa
PKG_VERS = 0.10.1
PKG_NAME = eza
PKG_VERS = 0.13.0
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/ogham/exa/archive
PKG_DIST_SITE = https://github.com/eza-community/eza/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/zlib-ng
DEPENDS = cross/zlib

# unsupported by cross/zlib-ng
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)

HOMEPAGE = https://the.exa.website/
HOMEPAGE = https://eza.rocks/
COMMENT = A modern replacement for 'ls'.
LICENSE = MIT

Expand Down
1 change: 1 addition & 0 deletions cross/eza/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin:bin/eza
3 changes: 3 additions & 0 deletions cross/eza/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eza-0.13.0.tar.gz SHA1 053a8fdfed411cb6f89fdaa3aa9de687c294859b
eza-0.13.0.tar.gz SHA256 3b774d1396f7aa5382d358133f2923a49639b1c615fea0942cbc63042c15830b
eza-0.13.0.tar.gz MD5 4f06d39b2c8071306836c037f0217936
11 changes: 7 additions & 4 deletions cross/file/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
PKG_NAME = file
PKG_VERS = 5.39
PKG_VERS = 5.45
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://ftp.astron.com/pub/file
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# remarks: the build environment must have file installed of the same version

DEPENDS =
BUILD_DEPENDS = native/file

HOMEPAGE = https://www.darwinsys.com/file/
COMMENT = The file command is "a file type guesser", that is, a command-line tool that tells you in words what kind of data a file contains. Unlike most GUI systems, command-line UNIX systems - with this program leading the charge - don't rely on filename extentions to tell you the type of a file, but look at the file's actual contents. This is, of course, more reliable, but requires a bit of I/O.
Expand All @@ -17,4 +15,9 @@ GNU_CONFIGURE = 1

ADDITIONAL_CPPFLAGS = -Os

# Inject native/file into magic/Makefile (by patched Makefile.in)
NATIVE_FILE = $(abspath $(WORK_DIR)/../../../native/file/work-native/install/usr/local/bin/file)
ENV += NATIVE_FILE=$(NATIVE_FILE)

include ../../mk/spksrc.cross-cc.mk

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.39.tar.gz SHA1 a5a8941a8e4c436fe22933db6a71c5161c3fb10b
file-5.39.tar.gz SHA256 f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
file-5.39.tar.gz MD5 1c450306053622803a25647d88f80f25
file-5.45.tar.gz SHA1 e8ee39339e5d3d68b7da9c45580f2ca5faf0db54
file-5.45.tar.gz SHA256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82
file-5.45.tar.gz MD5 26b2a96d4e3a8938827a1e572afd527a
14 changes: 14 additions & 0 deletions cross/file/patches/001-force-use-of-native-file.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# force the use of native file executable instead of system installed version
# required to compile the magic.mgc of the same version as the native executable
#
--- magic/Makefile.in.orig 2023-07-27 19:46:45.000000000 +0000
+++ magic/Makefile.in 2023-09-19 18:44:24.771956250 +0000
@@ -638,7 +638,7 @@

# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
-@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
+@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = ${NATIVE_FILE}
@IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE)
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP =
all: all-am
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.40.0
PKG_VERS = 0.42.0
PKG_EXT = tar.gz
PKG_REVISION = $(shell date +%m/%d/%Y)
PKG_DIST_NAME = $(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.40.0.tar.gz SHA1 7bf6fbb26d59bc22a1e44e2a2800ffe7df1a2164
fzf-0.40.0.tar.gz SHA256 9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65
fzf-0.40.0.tar.gz MD5 42ef06b3f318d7afb03648708edfa142
fzf-0.42.0.tar.gz SHA1 ac0e5b39a0642241980bfe10bad67f8dc8ca5fff
fzf-0.42.0.tar.gz SHA256 743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2
fzf-0.42.0.tar.gz MD5 b47bb2d48df48eb7967d7d770d77d0f8
2 changes: 1 addition & 1 deletion cross/jdupes/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = jdupes
PKG_VERS = 1.26.1
PKG_VERS = 1.27.3
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/jbruchon/jdupes/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/jdupes/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
jdupes-1.26.1.tar.gz SHA1 f47b81ec55f6bf67071fcc7bc2e3f0007bf8c443
jdupes-1.26.1.tar.gz SHA256 09153824320c65ad529f8f97cd3b7e792c50e9f9018192ea1a76f2e33a196225
jdupes-1.26.1.tar.gz MD5 98cad96bf21079d6ea88c1be132dd604
jdupes-1.27.3.tar.gz SHA1 c9c158d3e699176da3f5468a956b76327cbfe6b5
jdupes-1.27.3.tar.gz SHA256 6e8352f61b3920a2b5626c7122c3b80b4fdcc5cdd3f1c0c3424530425a77d846
jdupes-1.27.3.tar.gz MD5 692767c0b697d8c914f5c59e711143a8
8 changes: 4 additions & 4 deletions cross/jdupes/patches/001-use-std-gnu99.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# use -std=gnu99 that works for older compilers too.
#
--- Makefile.orig 2023-07-02 14:27:33.000000000 +0000
+++ Makefile 2023-07-03 20:55:13.670834358 +0000
@@ -37,7 +37,7 @@
--- Makefile.orig 2023-08-27 01:12:34.000000000 +0000
+++ Makefile 2023-09-19 20:37:23.480268500 +0000
@@ -38,7 +38,7 @@
# Configuration section
COMPILER_OPTIONS = -Wall -Wwrite-strings -Wcast-align -Wstrict-aliasing -Wstrict-prototypes -Wpointer-arith -Wundef
COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wconversion -Wunreachable-code -Wformat=2
COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wunreachable-code -Wformat=2
-COMPILER_OPTIONS += -std=gnu11 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe
+COMPILER_OPTIONS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe
COMPILER_OPTIONS += -DNO_ATIME
Expand Down
2 changes: 1 addition & 1 deletion cross/less/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = less
PKG_VERS = 633
PKG_VERS = 643
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.greenwoodsoftware.com/less
Expand Down
6 changes: 3 additions & 3 deletions cross/less/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
less-633.tar.gz SHA1 632207c546b0ee23d9097b7de82a81416e0b193d
less-633.tar.gz SHA256 2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f
less-633.tar.gz MD5 35cc7734e9e6224388ab7b9a214da4da
less-643.tar.gz SHA1 ee1f35a340b2631eb0376df7e073f01d86cdfbed
less-643.tar.gz SHA256 2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8
less-643.tar.gz MD5 cf05e2546a3729492b944b4874dd43dd
2 changes: 1 addition & 1 deletion cross/mc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = mc
PKG_VERS = 4.8.29
PKG_VERS = 4.8.30
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://ftp.midnight-commander.org/
Expand Down
6 changes: 3 additions & 3 deletions cross/mc/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mc-4.8.29.tar.xz SHA1 250411bd93c31fd3d818588add444bffd9b641fb
mc-4.8.29.tar.xz SHA256 01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4
mc-4.8.29.tar.xz MD5 7f9339b6b2167a7920ac29e133b9c594
mc-4.8.30.tar.xz SHA1 91708eb00ba0d7c1579de357745b1a6717b1dfac
mc-4.8.30.tar.xz SHA256 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df
mc-4.8.30.tar.xz MD5 96fcd04710b7848fedea8597da4bd7da
2 changes: 1 addition & 1 deletion cross/mg/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = mg
PKG_VERS = 3.6
PKG_VERS = 3.7
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/troglobit/mg/releases/download/v$(PKG_VERS)
Expand Down
6 changes: 3 additions & 3 deletions cross/mg/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mg-3.6.tar.gz SHA1 00451598948c890cc9cb151d153faac4969d230e
mg-3.6.tar.gz SHA256 0e30f99b7606ddd92535aec0ba0118557afa4adca0961267314a4bf7791865fb
mg-3.6.tar.gz MD5 a6eab531431abd3c9e1dbb18749e30b9
mg-3.7.tar.gz SHA1 0d33ea9a31ac05e6718ac60d0913da11c3acdf3b
mg-3.7.tar.gz SHA256 05101360d2194392da0950e8b6f18d067d8af0fd2f572461ba4d4e7b4ccbb4c1
mg-3.7.tar.gz MD5 0040c9e738bd204db26c6967bbb8be38
8 changes: 4 additions & 4 deletions cross/micro/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = micro
PKG_VERS = 2.0.11
PKG_VERS = 2.0.12
PKG_EXT = tar.gz
# make sure the hash matches this release, as it is shown with 'micro --version'
GIT_HASH = 225927b
GIT_HASH = c2cebaa
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/zyedidia/micro/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
Expand All @@ -11,7 +11,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
BUILD_DEPENDS = native/go

HOMEPAGE = https://micro-editor.github.io/
COMMENT = a modern and intuitive terminal-based text editor.
COMMENT = A modern and intuitive terminal-based text editor.
LICENSE = MIT

GOPATH = $(WORK_DIR)
Expand All @@ -24,5 +24,5 @@ include ../../mk/spksrc.cross-go.mk

.PHONY: micro_install
micro_install:
install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
@install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
@$(RUN) ; install -m 755 micro $(STAGING_INSTALL_PREFIX)/bin
6 changes: 3 additions & 3 deletions cross/micro/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
micro-2.0.11.tar.gz SHA1 0fb9454a9334ce237aad8573f7649641171677eb
micro-2.0.11.tar.gz SHA256 1bb499edeaaadf1fe1791a49f96ab672c4e1add31ee125882ccd85a0fc8a4abe
micro-2.0.11.tar.gz MD5 deb32d1fffe374a8592aa640eec643de
micro-2.0.12.tar.gz SHA1 901fd809fe5f594ba9b86d0d148b4f09d314133b
micro-2.0.12.tar.gz SHA256 936d109670035235da1f3fb07c76c57c729b59bc1460aab41feb3516136e450f
micro-2.0.12.tar.gz MD5 14717fd97623e502fdb92e269ff5058d
2 changes: 1 addition & 1 deletion cross/ncdu/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = ncdu
PKG_VERS = 1.18.1
PKG_VERS = 1.19
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://dev.yorhel.nl/download
Expand Down
6 changes: 3 additions & 3 deletions cross/ncdu/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ncdu-1.18.1.tar.gz SHA1 bdc12fa539db1e310a29431939efca7091dbb867
ncdu-1.18.1.tar.gz SHA256 7c0fa1eb29d85aaed4ba174164bdbb8f011b5c390d017c57d668fc7231332405
ncdu-1.18.1.tar.gz MD5 567df772ef0f2e28801009a90ab7b8e3
ncdu-1.19.tar.gz SHA1 3ee7aff60bdaa1c79eb4f27e3d277fc2d76e0043
ncdu-1.19.tar.gz SHA256 30363019180cde0752c7fb006c12e154920412f4e1b5dc3090654698496bb17d
ncdu-1.19.tar.gz MD5 7986451d5b222b8a99b5382f33a30831
11 changes: 11 additions & 0 deletions cross/nnn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ 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)

# REMARKGS:
# currently stay on version 4.8
# version 4.9 fails with the 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
# (but we 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)
Expand Down
2 changes: 1 addition & 1 deletion cross/rhash/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = RHash
PKG_VERS = 1.4.3
PKG_VERS = 1.4.4
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rhash/RHash/archive
Expand Down
7 changes: 4 additions & 3 deletions cross/rhash/PLIST
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
bin:bin/rhash
rsc:etc/rhashrc
lnk:bin/ed2k-link
lnk:bin/edonr256-hash
lnk:bin/edonr512-hash
lnk:bin/gost12-256-hash
lnk:bin/gost12-512-hash
lnk:bin/has160-hash
lnk:bin/magnet-link
bin:bin/rhash
lnk:bin/sfv-hash
lnk:bin/tiger-hash
lnk:bin/tth-hash
lnk:bin/whirlpool-hash
lib:lib/librhash.so.0
rsc:etc/rhashrc
lnk:lib/librhash.so.1
lib:lib/librhash.so.1.4.4
6 changes: 3 additions & 3 deletions cross/rhash/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
RHash-v1.4.3.tar.gz SHA1 6e698e6d5b13aeac55076d6a53dc4dab55f2114e
RHash-v1.4.3.tar.gz SHA256 1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e
RHash-v1.4.3.tar.gz MD5 6de2d29618321e98cbb6138813b99797
RHash-v1.4.4.tar.gz SHA1 feaee551aec9cc9a303a45aa8c864f97ece9ed2d
RHash-v1.4.4.tar.gz SHA256 8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a
RHash-v1.4.4.tar.gz MD5 85384cefd616b6371cc95b9d89ffca28
2 changes: 1 addition & 1 deletion cross/rmlint/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = rmlint
PKG_VERS = 2.10.1
PKG_VERS = 2.10.2
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/sahib/rmlint/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/rmlint/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rmlint-v2.10.1.tar.gz SHA1 9b4b8a7a38fbe3d105343bedda4198df8d3e9b26
rmlint-v2.10.1.tar.gz SHA256 10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883
rmlint-v2.10.1.tar.gz MD5 ded893cfb1b24f2ec4b5525d6b92c298
rmlint-v2.10.2.tar.gz SHA1 da49dba3d6bb71b87e1142b326a971d3018e6377
rmlint-v2.10.2.tar.gz SHA256 0a0233ad517e0fb721f21e188a57cdee5279dd5329b38acb56d5d5312ce46388
rmlint-v2.10.2.tar.gz MD5 4c3ebd6abb6843809d21d015a237ec30
11 changes: 0 additions & 11 deletions cross/rmlint/patches/001-scons-pkg-config-libdir.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--- SConstruct.orig 2023-08-08 16:19:57.000000000 +0000
+++ SConstruct 2023-09-21 05:46:09.095898401 +0000
@@ -538,7 +538,7 @@
PREFIX=GetOption('prefix'),
ENV = dict([ (key, os.environ[key])
for key in os.environ
- if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
+ if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH', 'PKG_CONFIG_LIBDIR']
])
)

@@ -710,9 +710,6 @@
if conf.env['HAVE_LIBELF']:
conf.env.Append(_LIBFLAGS=['-lelf'])

-# NB: After checks so they don't fail
-conf.env.Append(CCFLAGS=['-Werror=undef'])
-

if ARGUMENTS.get('GDB') == '1':
ARGUMENTS['DEBUG'] = '1'
10 changes: 6 additions & 4 deletions cross/rnm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PKG_VERS = 4.0.9
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/neurobin/rnm/archive/refs/tags
PKG_DIST_FILE=$(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/jpcre2 cross/gmp
Expand All @@ -18,9 +18,11 @@ PRE_CONFIGURE_TARGET = rnm_pre_configure

include ../../mk/spksrc.cross-cc.mk

# requires gnu GCC >= 4.8
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
# A compiler with support for C++11 language features is required.
UNSUPPORTED_ARCHS = $(ARCH)
endif

.PHONY: rnm_pre_configure
rnm_pre_configure:
$(RUN) ./autogen.sh
@$(RUN) ./autogen.sh
2 changes: 1 addition & 1 deletion cross/tree/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = tree
PKG_VERS = 2.1.0
PKG_VERS = 2.1.1
PKG_EXT = tgz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://mama.indstate.edu/users/ice/tree/src
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.0.tgz SHA1 68a3e519e40805ca54bf71b746951e3bd96e48fe
tree-2.1.0.tgz SHA256 0160c535bff2b0dc6a830b9944e981e3427380f63e748da96ced7071faebabf6
tree-2.1.0.tgz MD5 50aa5cdb28df6340ef67a3a3ec953ffc
tree-2.1.1.tgz SHA1 24c7eb69b9fd1d99eab8493f037eebd0213a0c3d
tree-2.1.1.tgz SHA256 d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5
tree-2.1.1.tgz MD5 1376096bad6b1875d680b18873c249f1
Loading

0 comments on commit 9ffe069

Please sign in to comment.