commit d222c632d5b8a9c8242a5a6e9902575ed7554ef7
parent 61031d3a32b701f39f4db4d60e04dc7f87737456
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 20:57:51 +0000
libunwind+strace
Diffstat:
10 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/templates/pkg/libunwind b/templates/pkg/libunwind
@@ -4,7 +4,12 @@
{%- endblock %}
{% block at_script %}
-autotools_static libunwind-1.8.1
+autotools_static libunwind-1.8.1 \
+ --enable-cxx-exceptions \
+ --enable-coredump \
+ --enable-ptrace \
+ --enable-setjmp \
+ --enable-zlib
{% endblock %}
{% block genlinks_begin %}
diff --git a/templates/pkg/strace b/templates/pkg/strace
@@ -9,7 +9,7 @@
cd strace-6.13
patch -p1 <../strace-6.5-static.patch
-autotools_static .
+autotools_static . --with-unwind --without-libdw
check_static command/strace
{% endblock %}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -36,7 +36,7 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+strace.29a2acdbb5aaf4821aadacddb60a82442cd77827c2834f35ed30c23e514e013b
+#+strace.5204fdf211058b8da5bb56021d9113a1dc8f41f8cb0a4a4a203c4c4ac2ded7cd
#+system-config.8b8a2b03a8f9bad97cf0a3db217832b54a3342816a7fb0c6bfb086547549de2c
#+system-config-rc.f1100a179601fb9629ec20a51431541d7092cfabd33ef8d9708e7767d315729f
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -57,7 +57,12 @@ check_static() {
}
-autotools_static libunwind-1.8.1
+autotools_static libunwind-1.8.1 \
+ --enable-cxx-exceptions \
+ --enable-coredump \
+ --enable-ptrace \
+ --enable-setjmp \
+ --enable-zlib
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -5,7 +5,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b
-#+libunwind.ab1e76c83917bebf63d9b3ca6af5bd46dc41ac2e5e29c9d42eadf39e4e878b55
+#+libunwind.9a75ea8ae4575da9113f8922a0e28d2f0c7cf64873af80790c07d5ff82ecfc40
#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
@@ -62,7 +62,7 @@ check_static() {
cd strace-6.13
patch -p1 <../strace-6.5-static.patch
-autotools_static .
+autotools_static . --with-unwind --without-libdw
check_static command/strace
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -36,4 +36,4 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+strace.29a2acdbb5aaf4821aadacddb60a82442cd77827c2834f35ed30c23e514e013b-
\ No newline at end of file
+#+strace.5204fdf211058b8da5bb56021d9113a1dc8f41f8cb0a4a4a203c4c4ac2ded7cd+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -36,7 +36,7 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+strace.c3f5ff2fd2d12bd085ffb0993661ca160d4c9e555d1fd4b1f513fed6d6d21ba8
+#+strace.3b079090ae3d33dc4c17c81938e4ef1d311844e175f8188d792042bb99e7354c
#+system-config.db2dff20fd0bda4dc1fedd9697304907d9eb143f1c6df0e733e1724a595250e3
#+system-config-rc.8f334e9cbdafc74e6fc7257996dc0fa8200054ec285bdb3901450467d9e52b58
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -57,7 +57,12 @@ check_static() {
}
-autotools_static libunwind-1.8.1
+autotools_static libunwind-1.8.1 \
+ --enable-cxx-exceptions \
+ --enable-coredump \
+ --enable-ptrace \
+ --enable-setjmp \
+ --enable-zlib
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -5,7 +5,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523
-#+libunwind.a4f50882a08688cbaaf022a71b984ef3f8742a4ba070d36d292a941189ea2aae
+#+libunwind.b5dbb4a90e53593d6531d86de48d16560e66c0ff43dbab3d616530f99f41bafd
#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
@@ -62,7 +62,7 @@ check_static() {
cd strace-6.13
patch -p1 <../strace-6.5-static.patch
-autotools_static .
+autotools_static . --with-unwind --without-libdw
check_static command/strace
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -36,4 +36,4 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+strace.c3f5ff2fd2d12bd085ffb0993661ca160d4c9e555d1fd4b1f513fed6d6d21ba8-
\ No newline at end of file
+#+strace.3b079090ae3d33dc4c17c81938e4ef1d311844e175f8188d792042bb99e7354c+
\ No newline at end of file
