commit b0bc6778ec039e46a304c5ecb1d2786cb0b45c05 parent 5ebd71e6eb8043dd517d41fe914331f203937df6 Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 18 Dec 2025 10:33:42 +0000 strace: patch the build makefile too Diffstat:
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/pkg/strace b/templates/pkg/strace @@ -15,7 +15,7 @@ patch -p1 <../strace-6.5-static.patch {%- block configure %} {{- super() -}} {# musl headers are full of checks for (undefined in C) __cplusplus defines -#} -sed -i 's/ -Wundef / -Wno-undef /' Makefile +sed -i 's/ -Wundef / -Wno-undef /' Makefile src/Makefile {% endblock %} {% block check -%} check_static command/strace 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.0b25eb0e7c867054235517f028a53be22df9631aa5e82f208752ec0c47a35602 +#+strace.b3ffe5c12a1e6d73b5bb82f7ff2c13cbb6185e6db57fedb13dc19590757d936a #+mlog.ce059718d3b1762e347b0cad882343156bb05f6c6bcb51def847165b4cafb3b6 #+findutils.4e4fdda94504fe07cf81c8ad346f1c7852967adac53b02acc99a9b21db32dd25 #+nawk.d88c12661ea83ac9155c8e559f840a72689d6ede74e34b9dab0708d19215654b diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace @@ -93,7 +93,7 @@ patch -p1 <../strace-6.5-static.patch build_env_static autotools_config_static --with-unwind --without-libdw --enable-mpers=check -sed -i 's/ -Wundef / -Wno-undef /' Makefile +sed -i 's/ -Wundef / -Wno-undef /' Makefile src/Makefile make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.0b25eb0e7c867054235517f028a53be22df9631aa5e82f208752ec0c47a35602 +#+strace.b3ffe5c12a1e6d73b5bb82f7ff2c13cbb6185e6db57fedb13dc19590757d936a #+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.e7c4c163541f7335a9c764767fa158c81448f6020c16cb5f5ff5c42c116dbcb5 +#+strace.9dc75781c9587c156c6d622922ed59f462c69540043b6032945ee4bbf421b7e6 #+mlog.2e42b820cfd31f022d9833c879674043690d1cfd5fce84acdb1027781ace1e43 #+findutils.a4fd11388875ebf538fc42df433d95749288aff36e43e9a23ab478cf5272780d #+nawk.5fc766426f2efe7b0075962350e7a2dd1719d4f922ec83bfa7534eca529194b7 diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace @@ -93,7 +93,7 @@ patch -p1 <../strace-6.5-static.patch build_env_static autotools_config_static --with-unwind --without-libdw --enable-mpers=check -sed -i 's/ -Wundef / -Wno-undef /' Makefile +sed -i 's/ -Wundef / -Wno-undef /' Makefile src/Makefile make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.e7c4c163541f7335a9c764767fa158c81448f6020c16cb5f5ff5c42c116dbcb5 +#+strace.9dc75781c9587c156c6d622922ed59f462c69540043b6032945ee4bbf421b7e6 #+mlog.2e42b820cfd31f022d9833c879674043690d1cfd5fce84acdb1027781ace1e43 #+findutils.a4fd11388875ebf538fc42df433d95749288aff36e43e9a23ab478cf5272780d #+nawk.5fc766426f2efe7b0075962350e7a2dd1719d4f922ec83bfa7534eca529194b7