commit 7bd6b3b4931d9087454dc79d5deeaf0f28523ee3
parent 2b4ba7f2fc9afe3e90b56e1db87b4cf2b9b0ee74
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 14 Dec 2025 21:09:32 +0000
set search path for toolchain libraries/packages
Diffstat:
13 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/templates/autotools_mcm b/templates/autotools_mcm
@@ -8,6 +8,10 @@
{% endblock template_deps %}
{%- block configure %}
build_env_static
+export CPATH=$pthbs_build_environment/{{includedir|shesc}}
+export LIBRARY_PATH=$pthbs_build_environment/{{libdir|shesc}}
+export LD_LIBRARY_PATH=$pthbs_build_environment/{{dynlibdir|shesc}}
+
autotools_config_static {% block configure_args %}{% endblock %} \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/ccx-x86_64/binutils b/variants/ccx-x86_64/binutils
@@ -62,6 +62,10 @@ patch -p1 <../merged.patch
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static --disable-nls \
--disable-werror \
--disable-multilib \
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -5,9 +5,9 @@
#+busybox.aec45c500bb25590b90931443cfb6b3413e475a3ff9dbfc8b1bbcdbd44853ea5
#+nawk.abe3790fd5e321ccd4e1ab7dab56339222e2eee686bc4b2241e7853104a4a500
#+musl.94daa1199f58e276874a1a0bfcf66f23082039e9c2419121909a9e6405c09071
-#+gmp.734fdc144b63273b8dcc8c7a639277b5df54f5efa620c0c0e63660dccae5c6b1
-#+mpc.42c7dbd72d71e756d1d4dcb5f32ce3218ed6024e5a9a04ea791abc6d2b01fed5
-#+mpfr.0c92c3445f9d01d385640a5bcebe8f42c516addc6c59a96a255e49328754a5a2
+#+gmp.c4fe23689ae879fa1007733822e94c380bf743b663353d0da203f71efe7a5605
+#+mpc.2bb994afffd5d31a4eb359c9d2319d1a807791574a9cd38efc9b867663454a9c
+#+mpfr.3aecff20a53409eac7ef72a55e3ce1f370e2a048d00bb52910b3bb053ac9789c
#@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
#@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esetroot.patch
#@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
@@ -49,7 +49,7 @@ export SOURCE_DATE_EPOCH=1748000928
mcm=/home/ccx/versions/musl-cross-make.7ce4f598a45b2472cf932bceac6abadc1ffa40231b4a7d834b22f543ed1d46c8
mcm_bin=$mcm/bin/x86_64-linux-musl
-binutils_cmd=/home/ccx/versions/binutils.b278e6c87188c63bf20864c68b02c89bda50217e79bb0ef260a0c8dc4808dee0
+binutils_cmd=/home/ccx/versions/binutils.e31e7b83908ea20b0982c950d42986eb3d30f335a7cf2be2ff946dbd4dacad3f
musl=/home/ccx/versions/musl.94daa1199f58e276874a1a0bfcf66f23082039e9c2419121909a9e6405c09071
build_env_static
diff --git a/variants/ccx-x86_64/gmp b/variants/ccx-x86_64/gmp
@@ -59,6 +59,10 @@ cd 'gmp-6.3.0'
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static --disable-nls \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/ccx-x86_64/mpc b/variants/ccx-x86_64/mpc
@@ -4,8 +4,8 @@
#+busybox.aec45c500bb25590b90931443cfb6b3413e475a3ff9dbfc8b1bbcdbd44853ea5
#+m4.9094331d14a18e8ccd572972fa0dea077ccf6232848642f3aa758d55a53e6fbf
#+nawk.abe3790fd5e321ccd4e1ab7dab56339222e2eee686bc4b2241e7853104a4a500
-#+gmp.734fdc144b63273b8dcc8c7a639277b5df54f5efa620c0c0e63660dccae5c6b1
-#+mpfr.0c92c3445f9d01d385640a5bcebe8f42c516addc6c59a96a255e49328754a5a2
+#+gmp.c4fe23689ae879fa1007733822e94c380bf743b663353d0da203f71efe7a5605
+#+mpfr.3aecff20a53409eac7ef72a55e3ce1f370e2a048d00bb52910b3bb053ac9789c
#@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
@@ -61,6 +61,10 @@ cd 'mpc-1.3.1'
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/ccx-x86_64/mpfr b/variants/ccx-x86_64/mpfr
@@ -4,7 +4,7 @@
#+busybox.aec45c500bb25590b90931443cfb6b3413e475a3ff9dbfc8b1bbcdbd44853ea5
#+m4.9094331d14a18e8ccd572972fa0dea077ccf6232848642f3aa758d55a53e6fbf
#+nawk.abe3790fd5e321ccd4e1ab7dab56339222e2eee686bc4b2241e7853104a4a500
-#+gmp.734fdc144b63273b8dcc8c7a639277b5df54f5efa620c0c0e63660dccae5c6b1
+#+gmp.c4fe23689ae879fa1007733822e94c380bf743b663353d0da203f71efe7a5605
#@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
@@ -60,6 +60,10 @@ cd 'mpfr-4.2.2'
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/ccx-x86_64/toolchain.environment b/variants/ccx-x86_64/toolchain.environment
@@ -1,4 +1,4 @@
#!/usr/bin/env pthbs-build
#+musl.94daa1199f58e276874a1a0bfcf66f23082039e9c2419121909a9e6405c09071
-#+gcc.165ed7972a2aa8d32267e1afc5b7e04927b1098a6e3eebd8837f97a0047314de
-#+binutils.b278e6c87188c63bf20864c68b02c89bda50217e79bb0ef260a0c8dc4808dee0-
\ No newline at end of file
+#+gcc.409b786c9c8cbe113a2c08c6b055ef0436d330447a637da86a7bf8e03fec0932
+#+binutils.e31e7b83908ea20b0982c950d42986eb3d30f335a7cf2be2ff946dbd4dacad3f+
\ No newline at end of file
diff --git a/variants/root-x86_64/binutils b/variants/root-x86_64/binutils
@@ -62,6 +62,10 @@ patch -p1 <../merged.patch
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static --disable-nls \
--disable-werror \
--disable-multilib \
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -5,9 +5,9 @@
#+busybox.24b965beaf8c04498a1cbfd06ee1243c631d71a957a9d46f85f6e3bd84c6bf3a
#+nawk.596c1948e96cbcabfe3954a70deb947de0c73be1ddde41fafe8291bfec04bdd4
#+musl.ea8bb1f16d8f8d43e5a131f724968612f185cfd2ce810694bac8bb7e450fac86
-#+gmp.b54cc4e18b56c894c46acb51713972ab888edbb43e213f10f1dcb4af8e247b64
-#+mpc.c49a0ca0206bf91daf1dbc6f1aa06d82d9d6c19da9b4e5a4d98341d70f02b866
-#+mpfr.6c584f4c5922b5c4494a52bd9a84a6e4db74f5c3e512493df59efe29356f2d20
+#+gmp.41b0601bc2302449ab7fb3c3c36b95bac9d0faf0c1e37fe6a85f85d6c87388de
+#+mpc.7a1f746c49258bbb0432d86e12b811601e8281cb3a30607e6e104d779d5e2886
+#+mpfr.3a03941a6ca8855350d56ef39d4db6f6508cb61e61de6821caa1e1fd084f45b9
#@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
#@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esetroot.patch
#@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
@@ -49,7 +49,7 @@ export SOURCE_DATE_EPOCH=1748000928
mcm=/versions/musl-cross-make.a0a693573fc6371cf996ecd5d6e1d1133a7ead4b6859746109af044c3b5f3b28
mcm_bin=$mcm/bin/x86_64-linux-musl
-binutils_cmd=/versions/binutils.c110ec769847695ad17151c3e756346c7a77dc245ecad7b2ff895f721896d845
+binutils_cmd=/versions/binutils.f8307e05b087afa3ad944da89a3f9cdb10b8a6d0242a578846a6606b279621b3
musl=/versions/musl.ea8bb1f16d8f8d43e5a131f724968612f185cfd2ce810694bac8bb7e450fac86
build_env_static
diff --git a/variants/root-x86_64/gmp b/variants/root-x86_64/gmp
@@ -59,6 +59,10 @@ cd 'gmp-6.3.0'
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static --disable-nls \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/root-x86_64/mpc b/variants/root-x86_64/mpc
@@ -4,8 +4,8 @@
#+busybox.24b965beaf8c04498a1cbfd06ee1243c631d71a957a9d46f85f6e3bd84c6bf3a
#+m4.822ccd1863da54457e965f3ff8b34dd8ff57174bc065d62afce1181502434088
#+nawk.596c1948e96cbcabfe3954a70deb947de0c73be1ddde41fafe8291bfec04bdd4
-#+gmp.b54cc4e18b56c894c46acb51713972ab888edbb43e213f10f1dcb4af8e247b64
-#+mpfr.6c584f4c5922b5c4494a52bd9a84a6e4db74f5c3e512493df59efe29356f2d20
+#+gmp.41b0601bc2302449ab7fb3c3c36b95bac9d0faf0c1e37fe6a85f85d6c87388de
+#+mpfr.3a03941a6ca8855350d56ef39d4db6f6508cb61e61de6821caa1e1fd084f45b9
#@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
@@ -61,6 +61,10 @@ cd 'mpc-1.3.1'
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/root-x86_64/mpfr b/variants/root-x86_64/mpfr
@@ -4,7 +4,7 @@
#+busybox.24b965beaf8c04498a1cbfd06ee1243c631d71a957a9d46f85f6e3bd84c6bf3a
#+m4.822ccd1863da54457e965f3ff8b34dd8ff57174bc065d62afce1181502434088
#+nawk.596c1948e96cbcabfe3954a70deb947de0c73be1ddde41fafe8291bfec04bdd4
-#+gmp.b54cc4e18b56c894c46acb51713972ab888edbb43e213f10f1dcb4af8e247b64
+#+gmp.41b0601bc2302449ab7fb3c3c36b95bac9d0faf0c1e37fe6a85f85d6c87388de
#@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
@@ -60,6 +60,10 @@ cd 'mpfr-4.2.2'
build_env_static
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+
autotools_config_static \
CFLAGS="-g0 -O2 -static --static" \
CXXFLAGS="-g0 -O2 -static --static" \
diff --git a/variants/root-x86_64/toolchain.environment b/variants/root-x86_64/toolchain.environment
@@ -1,4 +1,4 @@
#!/usr/bin/env pthbs-build
#+musl.ea8bb1f16d8f8d43e5a131f724968612f185cfd2ce810694bac8bb7e450fac86
-#+gcc.02b7589d64f7dbb65e5f397a25f2e8ea7038cd80eeac9b20a1ff93abcb8774d2
-#+binutils.c110ec769847695ad17151c3e756346c7a77dc245ecad7b2ff895f721896d845-
\ No newline at end of file
+#+gcc.8dc44cac8e64ee5d77e735407a55d2297f12d47e956cb41e193264381ed86b1f
+#+binutils.f8307e05b087afa3ad944da89a3f9cdb10b8a6d0242a578846a6606b279621b3+
\ No newline at end of file
