mrrl

commit b1715809c714d245d0658327c726c7eb19fd4dbc
parent 29d77561814deb3fcdeffe14ab4c8069575fcd9f
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 18 Dec 2025 10:51:36 +0000

strace: disable built-in headers

Diffstat:
M
templates/pkg/strace
 | 
2
+-
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/strace
 | 
2
+-
M
variants/ccx-x86_64/userspace.environment
 | 
2
+-
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/strace
 | 
2
+-
M
variants/root-x86_64/userspace.environment
 | 
2
+-

7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/pkg/strace b/templates/pkg/strace
@@ -11,7 +11,7 @@
 patch -p1 <../strace-6.5-static.patch
 
 {% endblock %}
-{%- block configure_args %}--with-unwind --without-libdw --enable-mpers=check{% endblock %}
+{%- block configure_args %}--with-unwind --without-libdw --enable-mpers=check --enable-bundled=no{% endblock %}
 {%- block configure %}
 {{- super() -}}
 {# musl headers are full of checks for (undefined in C) __cplusplus defines -#}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -80,7 +80,7 @@
 #+applyuidgid-caps.f1c0b74d5a86bc1c80432b18e0cdcc06c6b86586635eec44897b2f4ed77f00b5
 #+ccx-utils.d479f1a0daf884107369d75d9c74e812a1988ff87f57d478361def32bdf1934d
 #+user-env.4ccba1361940ca18b094e10c61ab4b85b75a2c926e48d4f19c87a7af6620594e
-#+strace.3d243ae87ce284dd750f7b4508adddccbbcde65637c3dcd155237b3e138dbce9
+#+strace.9c071950fb9a8480658d4b3d0c5e5f6c36e6b2642c7b75dc017cdf003fd6f907
 #+mlog.ce059718d3b1762e347b0cad882343156bb05f6c6bcb51def847165b4cafb3b6
 #+findutils.4e4fdda94504fe07cf81c8ad346f1c7852967adac53b02acc99a9b21db32dd25
 #+nawk.d88c12661ea83ac9155c8e559f840a72689d6ede74e34b9dab0708d19215654b
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -91,7 +91,7 @@ patch -p1 <../strace-6.5-static.patch
 
 
 build_env_static
-autotools_config_static --with-unwind --without-libdw --enable-mpers=check
+autotools_config_static --with-unwind --without-libdw --enable-mpers=check --enable-bundled=no
  
 sed -i 's/ -Wundef / -Wno-undef -Wno-system-headers /' Makefile src/Makefile
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -80,7 +80,7 @@
 #+applyuidgid-caps.f1c0b74d5a86bc1c80432b18e0cdcc06c6b86586635eec44897b2f4ed77f00b5
 #+ccx-utils.d479f1a0daf884107369d75d9c74e812a1988ff87f57d478361def32bdf1934d
 #+user-env.4ccba1361940ca18b094e10c61ab4b85b75a2c926e48d4f19c87a7af6620594e
-#+strace.3d243ae87ce284dd750f7b4508adddccbbcde65637c3dcd155237b3e138dbce9
+#+strace.9c071950fb9a8480658d4b3d0c5e5f6c36e6b2642c7b75dc017cdf003fd6f907
 #+mlog.ce059718d3b1762e347b0cad882343156bb05f6c6bcb51def847165b4cafb3b6
 #+findutils.4e4fdda94504fe07cf81c8ad346f1c7852967adac53b02acc99a9b21db32dd25
 #+nawk.d88c12661ea83ac9155c8e559f840a72689d6ede74e34b9dab0708d19215654b
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -80,7 +80,7 @@
 #+applyuidgid-caps.d35c54a8781e345227abf0188e650130cbd824c37897169f53a3b2b66e78b0a5
 #+ccx-utils.4416f6a152f6c96075d58a252383074b0a179314fa8a4794933337c791e6b252
 #+user-env.9d4b3ff69124e0566e73a7439e16de312af3fdd25dbf53258063a587e2870805
-#+strace.a13a56b72aa8aa6ebec95325b6ad94db9c78a93829b995979497f01af895e77b
+#+strace.62b88cccd3ccaef9390ac32a70eb4987790ea6c5d96b2a78071cfe7a2b71ddea
 #+mlog.2e42b820cfd31f022d9833c879674043690d1cfd5fce84acdb1027781ace1e43
 #+findutils.a4fd11388875ebf538fc42df433d95749288aff36e43e9a23ab478cf5272780d
 #+nawk.5fc766426f2efe7b0075962350e7a2dd1719d4f922ec83bfa7534eca529194b7
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -91,7 +91,7 @@ patch -p1 <../strace-6.5-static.patch
 
 
 build_env_static
-autotools_config_static --with-unwind --without-libdw --enable-mpers=check
+autotools_config_static --with-unwind --without-libdw --enable-mpers=check --enable-bundled=no
  
 sed -i 's/ -Wundef / -Wno-undef -Wno-system-headers /' Makefile src/Makefile
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -80,7 +80,7 @@
 #+applyuidgid-caps.d35c54a8781e345227abf0188e650130cbd824c37897169f53a3b2b66e78b0a5
 #+ccx-utils.4416f6a152f6c96075d58a252383074b0a179314fa8a4794933337c791e6b252
 #+user-env.9d4b3ff69124e0566e73a7439e16de312af3fdd25dbf53258063a587e2870805
-#+strace.a13a56b72aa8aa6ebec95325b6ad94db9c78a93829b995979497f01af895e77b
+#+strace.62b88cccd3ccaef9390ac32a70eb4987790ea6c5d96b2a78071cfe7a2b71ddea
 #+mlog.2e42b820cfd31f022d9833c879674043690d1cfd5fce84acdb1027781ace1e43
 #+findutils.a4fd11388875ebf538fc42df433d95749288aff36e43e9a23ab478cf5272780d
 #+nawk.5fc766426f2efe7b0075962350e7a2dd1719d4f922ec83bfa7534eca529194b7