mrrl

commit 022fdff345b1f14ddd04cfde1d96f919c1509ca0
parent 180b0b7bb77398e1712d39672136cc0297aca042
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 16:23:57 +0000

replace GNU basename call with POSIX version

Diffstat:
M
templates/pkg/attr
 | 
7
++++++-
M
variants/ccx-x86_64/attr
 | 
7
+++++--
M
variants/ccx-x86_64/default.environment
 | 
4
++--
M
variants/ccx-x86_64/squashfs-tools
 | 
2
+-
M
variants/ccx-x86_64/userspace.environment
 | 
4
++--
M
variants/root-x86_64/attr
 | 
7
+++++--
M
variants/root-x86_64/default.environment
 | 
4
++--
M
variants/root-x86_64/squashfs-tools
 | 
2
+-
M
variants/root-x86_64/userspace.environment
 | 
4
++--

9 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/templates/pkg/attr b/templates/pkg/attr
@@ -1,8 +1,13 @@
 {%- set pkg_version="2.5.2" -%}
 {%- set pkg_source="tar.gz" -%}
 {% extends "autotools_static_mini" %}
+{% block configure_args %}--disable-silent-rules{% endblock %}
 {% block configure %}
-CFLAGS="-D_GNU_SOURCE $CFLAGS"
+
+{# replace call to GNU basename with POSIX one -#}
+sed -i 's/^#include <string.h>/#include <libgen.h>\n&/' \
+	tools/attr.c tools/setattr.c tools/getattr.c
+
 LDFLAGS=--static
 {{ super() -}}
 {% endblock %}
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -87,11 +87,14 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'attr-2.5.2'
 
 
-CFLAGS="-D_GNU_SOURCE $CFLAGS"
+
+sed -i 's/^#include <string.h>/#include <libgen.h>\n&/' \
+	tools/attr.c tools/setattr.c tools/getattr.c
+
 LDFLAGS=--static
 
 build_env_static
-autotools_config_static 
+autotools_config_static --disable-silent-rules
  
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -44,7 +44,7 @@
 #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
 #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
 #+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+attr.caf3451cf6b48b044955afc17a71e70f95b26a1428cc2e12882cef66f2e4c538
+#+attr.9a8f62d53749998c4362fbf1694c7ecd5b3078fc2f0a004e8638a183d2285f6d
 #+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
 #+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
 #+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
@@ -86,7 +86,7 @@
 #+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
 #+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
 #+nvi.14d32964bb3e136507a7375f493728d2eb5356dca4a3c473c46fa7af540c0f49
-#+squashfs-tools.9348b5fc2a64eab30414b44c41e962e02132e133dc1dab51c065096c21def04b
+#+squashfs-tools.ed6033a25275d48865f3e37fd53afc21b6ffbb555681fb0cfdd46517473f9b80
 #+mandoc.337d52f28d2da9cb636d4917ee45cd9119c517b1c2034e7532554747fb3e1e96
 #+tinyssh.b476e3e4dd069844730f101e3030171c2a7fb0d5d80498ae45074f8d47410663
 #+system-config.56ecc319e5e26cb7e5f4170fb0078dc114b5ecfccb2830bb2396f7c6fd7c0bdf
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -30,7 +30,7 @@
 #+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
 #+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
 #+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+attr.caf3451cf6b48b044955afc17a71e70f95b26a1428cc2e12882cef66f2e4c538
+#+attr.9a8f62d53749998c4362fbf1694c7ecd5b3078fc2f0a004e8638a183d2285f6d
 #+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -44,7 +44,7 @@
 #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
 #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
 #+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+attr.caf3451cf6b48b044955afc17a71e70f95b26a1428cc2e12882cef66f2e4c538
+#+attr.9a8f62d53749998c4362fbf1694c7ecd5b3078fc2f0a004e8638a183d2285f6d
 #+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
 #+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
 #+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
@@ -86,6 +86,6 @@
 #+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
 #+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
 #+nvi.14d32964bb3e136507a7375f493728d2eb5356dca4a3c473c46fa7af540c0f49
-#+squashfs-tools.9348b5fc2a64eab30414b44c41e962e02132e133dc1dab51c065096c21def04b
+#+squashfs-tools.ed6033a25275d48865f3e37fd53afc21b6ffbb555681fb0cfdd46517473f9b80
 #+mandoc.337d52f28d2da9cb636d4917ee45cd9119c517b1c2034e7532554747fb3e1e96
 #+tinyssh.b476e3e4dd069844730f101e3030171c2a7fb0d5d80498ae45074f8d47410663 
\ No newline at end of file
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -87,11 +87,14 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'attr-2.5.2'
 
 
-CFLAGS="-D_GNU_SOURCE $CFLAGS"
+
+sed -i 's/^#include <string.h>/#include <libgen.h>\n&/' \
+	tools/attr.c tools/setattr.c tools/getattr.c
+
 LDFLAGS=--static
 
 build_env_static
-autotools_config_static 
+autotools_config_static --disable-silent-rules
  
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -44,7 +44,7 @@
 #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
 #+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+attr.aac067dc824f9747e73639fdf48829a1c29d0f51400917ada4489dd20b8685e5
+#+attr.77ea2f2a6eb4352f9057c12ca280bdcbb38ffdb2c6677f2f356df1e3ff977d38
 #+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
 #+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
 #+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
@@ -86,7 +86,7 @@
 #+findutils.e89f105e3728c9b749ed3ed4460c0fc7d25431fef03c3f1a5469d411aba57720
 #+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
 #+nvi.9d057db979867283de33020893c901c3f1da7166892e2655af6d15b0bca29733
-#+squashfs-tools.07f93e20b9501e226fdd9f06b1485b6a1fb2dfbed0471338ac9f1c79a8b24bf4
+#+squashfs-tools.76f28d536149662ff8af173681447cbffa85f77eb5e8af10a28f0f26623ee694
 #+mandoc.0d3becf9228dce20e8ea750f3f2a299466d1778051d5389949035a50b27ce105
 #+tinyssh.d792157f240c6fa9124a4fec24583112b3da0c634e2039181ba6db00f2146ce6
 #+system-config.ff6af9e8cee7086606defba374b10a867d1b2d9d9cceab623a048800ea956a78
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -30,7 +30,7 @@
 #+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
 #+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
 #+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+attr.aac067dc824f9747e73639fdf48829a1c29d0f51400917ada4489dd20b8685e5
+#+attr.77ea2f2a6eb4352f9057c12ca280bdcbb38ffdb2c6677f2f356df1e3ff977d38
 #+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -44,7 +44,7 @@
 #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
 #+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+attr.aac067dc824f9747e73639fdf48829a1c29d0f51400917ada4489dd20b8685e5
+#+attr.77ea2f2a6eb4352f9057c12ca280bdcbb38ffdb2c6677f2f356df1e3ff977d38
 #+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
 #+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
 #+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
@@ -86,6 +86,6 @@
 #+findutils.e89f105e3728c9b749ed3ed4460c0fc7d25431fef03c3f1a5469d411aba57720
 #+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
 #+nvi.9d057db979867283de33020893c901c3f1da7166892e2655af6d15b0bca29733
-#+squashfs-tools.07f93e20b9501e226fdd9f06b1485b6a1fb2dfbed0471338ac9f1c79a8b24bf4
+#+squashfs-tools.76f28d536149662ff8af173681447cbffa85f77eb5e8af10a28f0f26623ee694
 #+mandoc.0d3becf9228dce20e8ea750f3f2a299466d1778051d5389949035a50b27ce105
 #+tinyssh.d792157f240c6fa9124a4fec24583112b3da0c634e2039181ba6db00f2146ce6 
\ No newline at end of file