commit 8ebcd41710c2440f54ebd3a3ed91663143471fe7 parent 92126c35552b86301119eca5c57a3014388e38fb Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 4 Dec 2025 00:31:40 +0000 old mcm: use linux-6.15.7 headers in bootstrap-1 and final Diffstat:
24 files changed, 476 insertions(+), 64 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc @@ -0,0 +1,101 @@ +{%- set pkg_version="14.3.0" -%} +{%- set pkg_source="tar.xz" -%} +{% extends "genlinks_mini" %} +{%- block template_deps %}{% endblock %} +{% block package_deps -%} +#+{{pkg_install_name("musl-cross-make:bootstrap-1")}} +#+{{pkg_install_name("gnu-make:bootstrap")}} +#+{{pkg_install_name("busybox:bootstrap")}} +#@sha256:{{files["mcm-"~shortname~"-"~pkg_version~"-merged.diff"]}}:merged.patch +{% endblock package_deps %} +{% block prepare %} +{{- super() }} +patch -p1 <../merged.patch +{% endblock prepare %} +{% block configure %} +mcm={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-1")}} +mcm_bin=$mcm/bin/{{triplet}} +musl={{versions}}/musl.{{pkg_sha256("musl")}} + +./configure \ + --enable-languages=c,c++ \ + CFLAGS="-std=gnu17 -g0 -O2" \ + CXXFLAGS="-std=gnu++17 -g0 -O2" \ + FFLAGS="-g0 -O2" \ + LDFLAGS="-s" \ + --disable-bootstrap \ + --disable-assembly \ + --disable-werror \ + --target={{triplet}} \ + --prefix= \ + --libdir=/lib \ + --disable-multilib \ + --with-sysroot=/{{triplet}} \ + --enable-tls \ + --disable-libmudflap \ + --disable-libsanitizer \ + --disable-gnu-indirect-function \ + --disable-libmpx \ + --enable-initfini-array \ + --enable-libstdcxx-time=rt \ + --with-build-sysroot="$(realpath ..)/obj_sysroot" \ + AR_FOR_TARGET="$mcm_bin"-ar \ + AS_FOR_TARGET="$mcm_bin"-as \ + LD_FOR_TARGET="$mcm_bin"-ld \ + NM_FOR_TARGET="$mcm_bin"-nm \ + OBJCOPY_FOR_TARGET="$mcm_bin"-objcopy \ + OBJDUMP_FOR_TARGET="$mcm_bin"-objdump \ + RANLIB_FOR_TARGET="$mcm_bin"-ranlib \ + READELF_FOR_TARGET="$mcm_bin"-readelf \ + STRIP_FOR_TARGET="$mcm_bin"-strip \ + --build={{triplet.split("-")[0]}}-pc-linux-muslxx \ + --host={{triplet.split("-")[0]}}-pc-linux-muslxx + +{%- endblock configure %} +{%- block build %} +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false " \ + all-gcc + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false enable_shared=no " \ + all-target-libgcc + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false " + +{%- endblock build %} +{%- block install %} +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/{{triplet}}-ar "\ + RANLIB="$mcm/bin/{{triplet}}-ranlib" \ + DESTDIR="$dest" \ + install + +{%- endblock install %} +{% block genlinks_begin %} + {{- super() }} + x["./{{dynlibdir}}/libc.so"]=1 + x["./{{dynlibdir}}/lib/ld-musl-{{triplet.split("-")[0]}}.so.1"]=1 +{% endblock %} + diff --git a/templates/pkg/musl b/templates/pkg/musl @@ -43,7 +43,7 @@ make \ AR="$mcm/bin/{{triplet}}-ar "\ RANLIB="$mcm/bin/{{triplet}}-ranlib" \ DESTDIR="$dest" \ - install + install install-headers {%- endblock install %} {% block genlinks_begin %} diff --git a/templates/pkg/musl-cross-make:old b/templates/pkg/musl-cross-make:old @@ -5,7 +5,7 @@ #+{{pkg_install_name("busybox:oldbootstrap")}} {{ ps.mcm_sources( gcc="gcc-14.3.0.tar.xz", - linux="linux-6.5.4.tar.xz", + linux="linux-6.15.7.tar.xz", musl="musl-1.2.5.tar.gz", binutils="binutils-2.44.tar.gz", gmp="gmp-6.3.0.tar.xz", @@ -30,7 +30,7 @@ printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ "TARGET=x86_64-linux-musl" \ 'GCC_VER=14.3.0' \ - 'LINUX_VER=6.5.4' \ + 'LINUX_VER=6.15.7' \ 'MUSL_VER=1.2.5' \ 'BINUTILS_VER=2.44' \ 'GMP_VER=6.3.0' \ @@ -41,8 +41,6 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ 'COMMON_CONFIG += CC="x86_64-linux-musl-gcc ${st}" CXX="x86_64-linux-musl-g++ ${st}"' -printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ - 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz touch musl-cross-make/sources/* @@ -114,6 +112,7 @@ BEGIN { x["./include/zlib.h"]=1 x["./include/zconf.h"]=1 + x["./x86_64-linux-musl/include/linux/landlock.h"]=1 } function r1(s) { diff --git a/templates/pkg/musl-cross-make:oldbootstrap-1 b/templates/pkg/musl-cross-make:oldbootstrap-1 @@ -5,7 +5,7 @@ #+{{pkg_install_name("musl-cross-make:oldbootstrap-0")}} {{ ps.mcm_sources( gcc="gcc-14.3.0.tar.xz", - linux="linux-headers-4.19.88-2.tar.xz", + linux="linux-6.15.7.tar.xz", musl="musl-1.2.5.tar.gz", binutils="binutils-2.44.tar.gz", gmp="gmp-6.3.0.tar.xz", @@ -30,6 +30,7 @@ printf '%s\n' 'int main(void) { return 0; }' >true.c printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ 'GCC_VER=14.3.0' \ + 'LINUX_VER=6.15.7' \ 'MUSL_VER=1.2.5' \ 'BINUTILS_VER=2.44' \ 'GMP_VER=6.3.0' \ @@ -72,6 +73,7 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./bin/x86_64-linux-musl-g++"]=1 x["./bin/x86_64-linux-musl-gcc"]=1 + x["./x86_64-linux-musl/include/linux/landlock.h"]=1 } function r1(s) { diff --git a/variants/ccx-x86_64/busybox:old b/variants/ccx-x86_64/busybox:old @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.9d3c665b9dafdda3d1d8c8a5a3d75d4cfa68d80ab5c83802fa37b071e63e43b9 -#+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 -#+busybox.ff42a163f10913129299f6bad062442e6efdd3422b7fd441e7f2f3845e4d317c +#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28 +#+gnu-make.f7a9f661d661b37208d2aa4e333873919f3d61553740fc3238808e424e2af3fe +#+busybox.c53ee0cfb54d5778c62db354133b2cec91e20ec90d2575f68b862ba54c5cb082 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox diff --git a/variants/ccx-x86_64/busybox:oldbootstrap b/variants/ccx-x86_64/busybox:oldbootstrap @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.f5bbce43c2ebda8f0ef1df1c294c6612f93737264b11a58f066e9ac4f6957c6b -#+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 +#+musl-cross-make.732ea0bf279e4413ccdb870b1e18b02869a55a25b7dc0ac09dd49af9a4f1fd82 +#+gnu-make.f7a9f661d661b37208d2aa4e333873919f3d61553740fc3238808e424e2af3fe #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/home/ccx/versions/musl-cross-make.f5bbce43c2ebda8f0ef1df1c294c6612f93737264b11a58f066e9ac4f6957c6b -make=/home/ccx/versions/gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 +mcm=/home/ccx/versions/musl-cross-make.732ea0bf279e4413ccdb870b1e18b02869a55a25b7dc0ac09dd49af9a4f1fd82 +make=/home/ccx/versions/gnu-make.f7a9f661d661b37208d2aa4e333873919f3d61553740fc3238808e424e2af3fe export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc @@ -0,0 +1,154 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.76cf279d5ad4a8701de2ea5025aa8e2e94f0bcbf79eee534d7e66197c6c853c1 +#+gnu-make.f2ed650e0fc6741ae940145d114a932779251b577642c9c7b42f5d3fc1b8a7cb +#+busybox.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e +#@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch +#@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:. + + +# - build script start - + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'gcc-14.3.0' + +patch -p1 <../merged.patch + + +mcm=/home/ccx/versions/musl-cross-make.76cf279d5ad4a8701de2ea5025aa8e2e94f0bcbf79eee534d7e66197c6c853c1 +mcm_bin=$mcm/bin/x86_64-linux-musl +musl=/home/ccx/versions/musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645 + +./configure \ + --enable-languages=c,c++ \ + CFLAGS="-std=gnu17 -g0 -O2" \ + CXXFLAGS="-std=gnu++17 -g0 -O2" \ + FFLAGS="-g0 -O2" \ + LDFLAGS="-s" \ + --disable-bootstrap \ + --disable-assembly \ + --disable-werror \ + --target=x86_64-linux-musl \ + --prefix= \ + --libdir=/lib \ + --disable-multilib \ + --with-sysroot=/x86_64-linux-musl \ + --enable-tls \ + --disable-libmudflap \ + --disable-libsanitizer \ + --disable-gnu-indirect-function \ + --disable-libmpx \ + --enable-initfini-array \ + --enable-libstdcxx-time=rt \ + --with-build-sysroot="$(realpath ..)/obj_sysroot" \ + AR_FOR_TARGET="$mcm_bin"-ar \ + AS_FOR_TARGET="$mcm_bin"-as \ + LD_FOR_TARGET="$mcm_bin"-ld \ + NM_FOR_TARGET="$mcm_bin"-nm \ + OBJCOPY_FOR_TARGET="$mcm_bin"-objcopy \ + OBJDUMP_FOR_TARGET="$mcm_bin"-objdump \ + RANLIB_FOR_TARGET="$mcm_bin"-ranlib \ + READELF_FOR_TARGET="$mcm_bin"-readelf \ + STRIP_FOR_TARGET="$mcm_bin"-strip \ + --build=x86_64-pc-linux-muslxx \ + --host=x86_64-pc-linux-muslxx + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false " \ + all-gcc + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false enable_shared=no " \ + all-target-libgcc + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false " +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/x86_64-linux-musl-ar "\ + RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \ + DESTDIR="$dest" \ + install + + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./library.so/libc.so"]=1 + x["./library.so/lib/ld-musl-x86_64.so.1"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} +$2 == "env" { link($0); next } +$2 == ".env-template" { link($0); next } + +$2 == "command" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } +$2 == "sbin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 == "info" { link(s1("info", r1($0))); next } +$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next } +$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next } + +$2 == "config" { link($0); next } +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + retcode = 0 + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + retcode = 3 + } + } + exit retcode +}' >.install-links.new +mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/gnu-make:old b/variants/ccx-x86_64/gnu-make:old @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.9d3c665b9dafdda3d1d8c8a5a3d75d4cfa68d80ab5c83802fa37b071e63e43b9 -#+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 -#+busybox.ff42a163f10913129299f6bad062442e6efdd3422b7fd441e7f2f3845e4d317c +#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28 +#+gnu-make.f7a9f661d661b37208d2aa4e333873919f3d61553740fc3238808e424e2af3fe +#+busybox.c53ee0cfb54d5778c62db354133b2cec91e20ec90d2575f68b862ba54c5cb082 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. diff --git a/variants/ccx-x86_64/gnu-make:oldbootstrap b/variants/ccx-x86_64/gnu-make:oldbootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.f5bbce43c2ebda8f0ef1df1c294c6612f93737264b11a58f066e9ac4f6957c6b +#+musl-cross-make.732ea0bf279e4413ccdb870b1e18b02869a55a25b7dc0ac09dd49af9a4f1fd82 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' -mcm=/home/ccx/versions/musl-cross-make.f5bbce43c2ebda8f0ef1df1c294c6612f93737264b11a58f066e9ac4f6957c6b +mcm=/home/ccx/versions/musl-cross-make.732ea0bf279e4413ccdb870b1e18b02869a55a25b7dc0ac09dd49af9a4f1fd82 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/ccx-x86_64/musl b/variants/ccx-x86_64/musl @@ -40,7 +40,7 @@ make \ AR="$mcm/bin/x86_64-linux-musl-ar "\ RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \ DESTDIR="$dest" \ - install + install install-headers diff --git a/variants/ccx-x86_64/musl-cross-make:old b/variants/ccx-x86_64/musl-cross-make:old @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.f5bbce43c2ebda8f0ef1df1c294c6612f93737264b11a58f066e9ac4f6957c6b -#+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 -#+busybox.ff42a163f10913129299f6bad062442e6efdd3422b7fd441e7f2f3845e4d317c +#+musl-cross-make.732ea0bf279e4413ccdb870b1e18b02869a55a25b7dc0ac09dd49af9a4f1fd82 +#+gnu-make.f7a9f661d661b37208d2aa4e333873919f3d61553740fc3238808e424e2af3fe +#+busybox.c53ee0cfb54d5778c62db354133b2cec91e20ec90d2575f68b862ba54c5cb082 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz -#@sha256:bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669:musl-cross-make/sources/linux-6.5.4.tar.xz +#@sha256:3507dd105b0a0e1101bd43d294472fccf853429a259a5fa7c67467bba318f8e9:musl-cross-make/sources/linux-6.15.7.tar.xz #@sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:musl-cross-make/sources/mpc-1.3.1.tar.gz #@sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:musl-cross-make/sources/gcc-14.3.0.tar.xz #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz @@ -28,7 +28,7 @@ printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ "TARGET=x86_64-linux-musl" \ 'GCC_VER=14.3.0' \ - 'LINUX_VER=6.5.4' \ + 'LINUX_VER=6.15.7' \ 'MUSL_VER=1.2.5' \ 'BINUTILS_VER=2.44' \ 'GMP_VER=6.3.0' \ @@ -39,8 +39,6 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ 'COMMON_CONFIG += CC="x86_64-linux-musl-gcc ${st}" CXX="x86_64-linux-musl-g++ ${st}"' -printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ - 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz touch musl-cross-make/sources/* @@ -112,6 +110,7 @@ BEGIN { x["./include/zlib.h"]=1 x["./include/zconf.h"]=1 + x["./x86_64-linux-musl/include/linux/landlock.h"]=1 } function r1(s) { diff --git a/variants/ccx-x86_64/musl-cross-make:oldbootstrap-1 b/variants/ccx-x86_64/musl-cross-make:oldbootstrap-1 @@ -5,7 +5,7 @@ #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz -#@sha256:dc7abf734487553644258a3822cfd429d74656749e309f2b25f09f4282e05588:musl-cross-make/sources/linux-headers-4.19.88-2.tar.xz +#@sha256:3507dd105b0a0e1101bd43d294472fccf853429a259a5fa7c67467bba318f8e9:musl-cross-make/sources/linux-6.15.7.tar.xz #@sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:musl-cross-make/sources/mpc-1.3.1.tar.gz #@sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:musl-cross-make/sources/gcc-14.3.0.tar.xz #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz @@ -28,6 +28,7 @@ printf '%s\n' 'int main(void) { return 0; }' >true.c printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ 'GCC_VER=14.3.0' \ + 'LINUX_VER=6.15.7' \ 'MUSL_VER=1.2.5' \ 'BINUTILS_VER=2.44' \ 'GMP_VER=6.3.0' \ @@ -70,6 +71,7 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./bin/x86_64-linux-musl-g++"]=1 x["./bin/x86_64-linux-musl-gcc"]=1 + x["./x86_64-linux-musl/include/linux/landlock.h"]=1 } function r1(s) { diff --git a/variants/ccx-x86_64/oldbootstrap.environment b/variants/ccx-x86_64/oldbootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.ff42a163f10913129299f6bad062442e6efdd3422b7fd441e7f2f3845e4d317c -#+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 -#+musl-cross-make.f5bbce43c2ebda8f0ef1df1c294c6612f93737264b11a58f066e9ac4f6957c6b- \ No newline at end of file +#+busybox.c53ee0cfb54d5778c62db354133b2cec91e20ec90d2575f68b862ba54c5cb082 +#+gnu-make.f7a9f661d661b37208d2aa4e333873919f3d61553740fc3238808e424e2af3fe +#+musl-cross-make.732ea0bf279e4413ccdb870b1e18b02869a55a25b7dc0ac09dd49af9a4f1fd82+ \ No newline at end of file diff --git a/variants/ccx-x86_64/oldsystem.environment b/variants/ccx-x86_64/oldsystem.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.9d3c665b9dafdda3d1d8c8a5a3d75d4cfa68d80ab5c83802fa37b071e63e43b9 -#+busybox.75d2455d407bab8011c71f7f6b23bd1c64c38c6b7c0440a721aaa25d289dd96f -#+gnu-make.de27d9f7b6653747e1d3021c8a505f480b5121c5b3750c0eb2074486757e812e- \ No newline at end of file +#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28 +#+busybox.01681f503fc4c718e7aea04073b8d87eee277a6ae992524cfc3038b279eb3a12 +#+gnu-make.a816f5db6b4001d03944673cbaad9b4fcf37839e80c7ed925463df12c9ed5289+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox:old b/variants/root-x86_64/busybox:old @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.dbf1917f9978ac1bdf82352d1f81ccd9c58414ad4cd5527e52f9f32f2becf674 -#+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b -#+busybox.0dcdccc7129012233193d592d24cd8f26263c4ab09553ba991729d67a8f44c84 +#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b +#+gnu-make.458ee2b8eb3bb8056cfd6156af960b72f97cc041ce7222ea1406d19b74165a0a +#+busybox.f33863ff2a0ea34a059302571c0d89632120cd171f5f7f5bf30bd495fbec5670 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox diff --git a/variants/root-x86_64/busybox:oldbootstrap b/variants/root-x86_64/busybox:oldbootstrap @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.0ab380cdb0150ec358f72253adeb154112c792fd5f29abb6217f62328eb678ec -#+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b +#+musl-cross-make.71539c4d07b0f22be406b63745ffe75af71399366bcb086be2ec97cc4b38c4d1 +#+gnu-make.458ee2b8eb3bb8056cfd6156af960b72f97cc041ce7222ea1406d19b74165a0a #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/versions/musl-cross-make.0ab380cdb0150ec358f72253adeb154112c792fd5f29abb6217f62328eb678ec -make=/versions/gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b +mcm=/versions/musl-cross-make.71539c4d07b0f22be406b63745ffe75af71399366bcb086be2ec97cc4b38c4d1 +make=/versions/gnu-make.458ee2b8eb3bb8056cfd6156af960b72f97cc041ce7222ea1406d19b74165a0a export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc @@ -0,0 +1,154 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.fc96c556cd0441f0bef75ae5ddbcd87d0b9b0a9cc439cf01f1d11f44dc589112 +#+gnu-make.3bf13b906d934aba6aab1bfa4cce7e2b6d42237210aaad5838dfa892b0fa6a65 +#+busybox.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57 +#@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch +#@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:. + + +# - build script start - + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'gcc-14.3.0' + +patch -p1 <../merged.patch + + +mcm=/versions/musl-cross-make.fc96c556cd0441f0bef75ae5ddbcd87d0b9b0a9cc439cf01f1d11f44dc589112 +mcm_bin=$mcm/bin/x86_64-linux-musl +musl=/versions/musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d + +./configure \ + --enable-languages=c,c++ \ + CFLAGS="-std=gnu17 -g0 -O2" \ + CXXFLAGS="-std=gnu++17 -g0 -O2" \ + FFLAGS="-g0 -O2" \ + LDFLAGS="-s" \ + --disable-bootstrap \ + --disable-assembly \ + --disable-werror \ + --target=x86_64-linux-musl \ + --prefix= \ + --libdir=/lib \ + --disable-multilib \ + --with-sysroot=/x86_64-linux-musl \ + --enable-tls \ + --disable-libmudflap \ + --disable-libsanitizer \ + --disable-gnu-indirect-function \ + --disable-libmpx \ + --enable-initfini-array \ + --enable-libstdcxx-time=rt \ + --with-build-sysroot="$(realpath ..)/obj_sysroot" \ + AR_FOR_TARGET="$mcm_bin"-ar \ + AS_FOR_TARGET="$mcm_bin"-as \ + LD_FOR_TARGET="$mcm_bin"-ld \ + NM_FOR_TARGET="$mcm_bin"-nm \ + OBJCOPY_FOR_TARGET="$mcm_bin"-objcopy \ + OBJDUMP_FOR_TARGET="$mcm_bin"-objdump \ + RANLIB_FOR_TARGET="$mcm_bin"-ranlib \ + READELF_FOR_TARGET="$mcm_bin"-readelf \ + STRIP_FOR_TARGET="$mcm_bin"-strip \ + --build=x86_64-pc-linux-muslxx \ + --host=x86_64-pc-linux-muslxx + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false " \ + all-gcc + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false enable_shared=no " \ + all-target-libgcc + +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false " +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/x86_64-linux-musl-ar "\ + RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \ + DESTDIR="$dest" \ + install + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./library.so/libc.so"]=1 + x["./library.so/lib/ld-musl-x86_64.so.1"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} +$2 == "env" { link($0); next } +$2 == ".env-template" { link($0); next } + +$2 == "command" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } +$2 == "sbin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 == "info" { link(s1("info", r1($0))); next } +$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next } +$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next } + +$2 == "config" { link($0); next } +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + retcode = 0 + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + retcode = 3 + } + } + exit retcode +}' >.install-links.new +mv .install-links.new .install-links + diff --git a/variants/root-x86_64/gnu-make:old b/variants/root-x86_64/gnu-make:old @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.dbf1917f9978ac1bdf82352d1f81ccd9c58414ad4cd5527e52f9f32f2becf674 -#+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b -#+busybox.0dcdccc7129012233193d592d24cd8f26263c4ab09553ba991729d67a8f44c84 +#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b +#+gnu-make.458ee2b8eb3bb8056cfd6156af960b72f97cc041ce7222ea1406d19b74165a0a +#+busybox.f33863ff2a0ea34a059302571c0d89632120cd171f5f7f5bf30bd495fbec5670 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. diff --git a/variants/root-x86_64/gnu-make:oldbootstrap b/variants/root-x86_64/gnu-make:oldbootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.0ab380cdb0150ec358f72253adeb154112c792fd5f29abb6217f62328eb678ec +#+musl-cross-make.71539c4d07b0f22be406b63745ffe75af71399366bcb086be2ec97cc4b38c4d1 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' -mcm=/versions/musl-cross-make.0ab380cdb0150ec358f72253adeb154112c792fd5f29abb6217f62328eb678ec +mcm=/versions/musl-cross-make.71539c4d07b0f22be406b63745ffe75af71399366bcb086be2ec97cc4b38c4d1 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/root-x86_64/musl b/variants/root-x86_64/musl @@ -40,7 +40,7 @@ make \ AR="$mcm/bin/x86_64-linux-musl-ar "\ RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \ DESTDIR="$dest" \ - install + install install-headers diff --git a/variants/root-x86_64/musl-cross-make:old b/variants/root-x86_64/musl-cross-make:old @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.0ab380cdb0150ec358f72253adeb154112c792fd5f29abb6217f62328eb678ec -#+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b -#+busybox.0dcdccc7129012233193d592d24cd8f26263c4ab09553ba991729d67a8f44c84 +#+musl-cross-make.71539c4d07b0f22be406b63745ffe75af71399366bcb086be2ec97cc4b38c4d1 +#+gnu-make.458ee2b8eb3bb8056cfd6156af960b72f97cc041ce7222ea1406d19b74165a0a +#+busybox.f33863ff2a0ea34a059302571c0d89632120cd171f5f7f5bf30bd495fbec5670 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz -#@sha256:bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669:musl-cross-make/sources/linux-6.5.4.tar.xz +#@sha256:3507dd105b0a0e1101bd43d294472fccf853429a259a5fa7c67467bba318f8e9:musl-cross-make/sources/linux-6.15.7.tar.xz #@sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:musl-cross-make/sources/mpc-1.3.1.tar.gz #@sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:musl-cross-make/sources/gcc-14.3.0.tar.xz #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz @@ -28,7 +28,7 @@ printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/versions/$pthbs_package" \ "TARGET=x86_64-linux-musl" \ 'GCC_VER=14.3.0' \ - 'LINUX_VER=6.5.4' \ + 'LINUX_VER=6.15.7' \ 'MUSL_VER=1.2.5' \ 'BINUTILS_VER=2.44' \ 'GMP_VER=6.3.0' \ @@ -39,8 +39,6 @@ printf '%s\n' >musl-cross-make/config.mak \ 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ 'COMMON_CONFIG += CC="x86_64-linux-musl-gcc ${st}" CXX="x86_64-linux-musl-g++ ${st}"' -printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ - 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz touch musl-cross-make/sources/* @@ -112,6 +110,7 @@ BEGIN { x["./include/zlib.h"]=1 x["./include/zconf.h"]=1 + x["./x86_64-linux-musl/include/linux/landlock.h"]=1 } function r1(s) { diff --git a/variants/root-x86_64/musl-cross-make:oldbootstrap-1 b/variants/root-x86_64/musl-cross-make:oldbootstrap-1 @@ -5,7 +5,7 @@ #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz -#@sha256:dc7abf734487553644258a3822cfd429d74656749e309f2b25f09f4282e05588:musl-cross-make/sources/linux-headers-4.19.88-2.tar.xz +#@sha256:3507dd105b0a0e1101bd43d294472fccf853429a259a5fa7c67467bba318f8e9:musl-cross-make/sources/linux-6.15.7.tar.xz #@sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:musl-cross-make/sources/mpc-1.3.1.tar.gz #@sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:musl-cross-make/sources/gcc-14.3.0.tar.xz #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz @@ -28,6 +28,7 @@ printf '%s\n' 'int main(void) { return 0; }' >true.c printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/versions/$pthbs_package" \ 'GCC_VER=14.3.0' \ + 'LINUX_VER=6.15.7' \ 'MUSL_VER=1.2.5' \ 'BINUTILS_VER=2.44' \ 'GMP_VER=6.3.0' \ @@ -70,6 +71,7 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./bin/x86_64-linux-musl-g++"]=1 x["./bin/x86_64-linux-musl-gcc"]=1 + x["./x86_64-linux-musl/include/linux/landlock.h"]=1 } function r1(s) { diff --git a/variants/root-x86_64/oldbootstrap.environment b/variants/root-x86_64/oldbootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.0dcdccc7129012233193d592d24cd8f26263c4ab09553ba991729d67a8f44c84 -#+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b -#+musl-cross-make.0ab380cdb0150ec358f72253adeb154112c792fd5f29abb6217f62328eb678ec- \ No newline at end of file +#+busybox.f33863ff2a0ea34a059302571c0d89632120cd171f5f7f5bf30bd495fbec5670 +#+gnu-make.458ee2b8eb3bb8056cfd6156af960b72f97cc041ce7222ea1406d19b74165a0a +#+musl-cross-make.71539c4d07b0f22be406b63745ffe75af71399366bcb086be2ec97cc4b38c4d1+ \ No newline at end of file diff --git a/variants/root-x86_64/oldsystem.environment b/variants/root-x86_64/oldsystem.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.dbf1917f9978ac1bdf82352d1f81ccd9c58414ad4cd5527e52f9f32f2becf674 -#+busybox.6740dc81acb79ee287396aa80af4f59e2d7e13e05fbad673caf0018bc8dc9d96 -#+gnu-make.e82fd7c2bef2b110c721c15b33b27c61accc997d9d250e3f4924b5a5c1331e37- \ No newline at end of file +#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b +#+busybox.31ec10d3bf898fbf979d4dac00a44eceeb11872fb66350d3f2498a4ce29c5003 +#+gnu-make.4368daa97181819adea3a10e38a4cb4ed1c9545d94de0efe06221352f29e478f+ \ No newline at end of file