mrrl

commit 57c7d81fa3e11803a794376ae6a75013ccfd7836
parent 9cb0ba9c06e90d4a2b7991b2a158e67a73a149ce
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 18 Dec 2025 00:51:02 +0000

gcc: set ESYSROOT for checks

Diffstat:
M
filelist.sha256
 | 
2
+-
R
files/gcc14-esetroot.patch -> files/gcc14-esysroot.patch
 | 
0

M
templates/pkg/gcc
 | 
5
+++--
M
variants/ccx-x86_64/gcc
 | 
5
+++--
M
variants/ccx-x86_64/toolchain.environment
 | 
2
+-
M
variants/root-x86_64/gcc
 | 
5
+++--
M
variants/root-x86_64/toolchain.environment
 | 
2
+-

7 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -38,7 +38,7 @@ b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5  files/default-
 1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd  files/easyseccomp-configure.tar
 eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10  files/easyseccomp_fix_includes.patch
 a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e  files/elf.h
-c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1  files/gcc14-esetroot.patch
+c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1  files/gcc14-esysroot.patch
 f5c64eac06f454fac0dfed81e5112fa21ec12c0e78f46d25fd6aaa57ff5d311f  files/gcc14-no-mangle-cflags.patch
 0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b  files/gelf.h
 cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867  files/lh_bootstrap-x86_64-config
diff --git a/files/gcc14-esetroot.patch b/files/gcc14-esysroot.patch
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -15,12 +15,12 @@
 #+{{pkg_install_name("mpc")}}
 #+{{pkg_install_name("mpfr")}}
 #@sha256:{{files["mcm-"~shortname~"-"~pkg_version~"-merged.diff"]}}:merged.patch
-#@sha256:{{files["gcc14-esetroot.patch"]}}:esetroot.patch
+#@sha256:{{files["gcc14-esysroot.patch"]}}:esysroot.patch
 {% endblock package_deps %}
 {% block prepare %}
 {{- super() }}
 patch -p1 <../merged.patch
-patch -p1 <../esetroot.patch
+patch -p1 <../esysroot.patch
 {% endblock prepare %}
 {% block configure %}
 export TZ=UTC
@@ -226,6 +226,7 @@ done
 
 {%- endblock install %}
 {%- block check %}
+export ESYSROOT=$pthbs_build_environment
 # Validate the C compiler
 "$dest"/{{bindir|shesc}}/{{triplet}}-gcc --version
 printf '%s\n' 'int main(void) { return 0; }' >true.c
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -9,7 +9,7 @@
 #+mpc.9c323c2e23836828197131d66b37fdecbfec8e6f2fcc8b14cfdfbcf4a3e82edf
 #+mpfr.048040b5b709a19cf4e78704d025e88815d1dbf18c23760482bbf45e0238847c
 #@sha256:b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3:merged.patch
-#@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esetroot.patch
+#@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esysroot.patch
 #@untar:-J:sha256:9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5:.
 
 
@@ -41,7 +41,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'gcc-13.4.0'
 
 patch -p1 <../merged.patch
-patch -p1 <../esetroot.patch
+patch -p1 <../esysroot.patch
 
 
 export TZ=UTC
@@ -204,6 +204,7 @@ for util in addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump r
 done
 
 
+export ESYSROOT=$pthbs_build_environment
 # Validate the C compiler
 "$dest"/'command'/x86_64-linux-musl-gcc --version
 printf '%s\n' 'int main(void) { return 0; }' >true.c
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.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6
-#+gcc.21c6ef8950f2d4f737d08b982419f305c694d90c28c5901b7c9b49cc79a5b1d5
+#+gcc.ea5267c6bc8005911bc9e4275c4f4dd86381a0eec09fe9d74e7fc1127ba5df59
 #+binutils.e27b3c2c7968d0c9ecd3f1be245f3ae14f44e4eeb82cd538cfc0f96f1afc4ef0 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -9,7 +9,7 @@
 #+mpc.7cf67a2fe6cf12db441535a15c4e5927fc9f4f6f1998eb737ffd67b7f4203afa
 #+mpfr.7d6789d39bedae2d537a23c4477da26fcd896338d684619e5331ffe89e35a5e0
 #@sha256:b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3:merged.patch
-#@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esetroot.patch
+#@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esysroot.patch
 #@untar:-J:sha256:9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5:.
 
 
@@ -41,7 +41,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'gcc-13.4.0'
 
 patch -p1 <../merged.patch
-patch -p1 <../esetroot.patch
+patch -p1 <../esysroot.patch
 
 
 export TZ=UTC
@@ -204,6 +204,7 @@ for util in addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump r
 done
 
 
+export ESYSROOT=$pthbs_build_environment
 # Validate the C compiler
 "$dest"/'command'/x86_64-linux-musl-gcc --version
 printf '%s\n' 'int main(void) { return 0; }' >true.c
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.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664
-#+gcc.4d1543f3781d1d3894a3d25b13235b827580006b823e11b48c6258822e684080
+#+gcc.c756197c84e98eadc8883fcd7bb02cea5c4e99a1706e8194bbedcc839b8bcd7b
 #+binutils.06634a7c6783445d52e5e45894b0c379f5be4df44124169e50096929bef7b5ee 
\ No newline at end of file