commit e0587e95ae9a7230fa282267a5622368f9935a4e parent 30849f746985c002aa76ce6838acd44f947d026b Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 17 Dec 2025 00:01:17 +0000 targeted gcc version in a global config Diffstat:
62 files changed, 741 insertions(+), 188 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256 @@ -57,6 +57,7 @@ f10cfaed6dfe709e01ece7ec1d4e778d1756b15adf91dcdcbaff973f6caf11c3 files/mcm-gcc- 9afc2d148ef5ccfa4da8508b714e6ae0e85c92ac123598ac1a2b9f0fdb6b2d67 files/mcm-gcc-11.5.0-merged.diff b6126e4c4044d7c55cc65c5d2f3b3953ee2be654ad6999fff7401a492bfb0018 files/mcm-gcc-12.4.0-merged.diff b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3 files/mcm-gcc-13.3.0-merged.diff +b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3 files/mcm-gcc-13.4.0-merged.diff f52a99de1e27aeac0ae53bfac104459e2b31b175303496b93ab71011733fee78 files/mcm-gcc-14.2.0-merged.diff 62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160 files/mcm-gcc-14.3.0-merged.diff c7fd11d821dcc2d665d9acc28515c261fe400cc3194420953993cb73284208ad files/mcm-gcc-15.1.0-merged.diff diff --git a/files/mcm-gcc-13.4.0-merged.diff b/files/mcm-gcc-13.4.0-merged.diff @@ -0,0 +1,547 @@ +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/common.opt gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/common.opt +--- a/gcc/common.opt 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/common.opt 2025-11-30 02:12:28.000000000 +0000 +@@ -3669,11 +3669,11 @@ Driver + + no-pie + Driver RejectNegative Negative(shared) +-Don't create a dynamically linked position independent executable. ++Don't create a position independent executable. + + pie + Driver RejectNegative Negative(no-pie) +-Create a dynamically linked position independent executable. ++Create a position independent executable. + + static-pie + Driver RejectNegative Negative(pie) +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/gnu-user.h gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/gnu-user.h +--- a/gcc/config/gnu-user.h 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/gnu-user.h 2025-11-30 02:12:28.000000000 +0000 +@@ -51,13 +51,12 @@ see the files COPYING3 and COPYING.RUNTI + #define GNU_USER_TARGET_STARTFILE_SPEC \ + "%{shared:; \ + pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \ +- static:crt1.o%s; \ +- static-pie:rcrt1.o%s; \ ++ static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \ + " PIE_SPEC ":Scrt1.o%s; \ + :crt1.o%s} " \ + GNU_USER_TARGET_CRTI " \ +- %{static:crtbeginT.o%s; \ +- shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \ ++ %{shared|" PIE_SPEC ":crtbeginS.o%s; \ ++ static:crtbeginT.o%s; \ + :crtbegin.o%s} \ + %{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_start_preinit.o%s; \ +@@ -73,11 +72,11 @@ see the files COPYING3 and COPYING.RUNTI + GNU userspace "finalizer" file, `crtn.o'. */ + + #define GNU_USER_TARGET_ENDFILE_SPEC \ +- "%{!static:%{fvtable-verify=none:%s; \ ++ "%{static|static-pie:; \ ++ fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_end_preinit.o%s; \ +- fvtable-verify=std:vtv_end.o%s}} \ +- %{static:crtend.o%s; \ +- shared|static-pie|" PIE_SPEC ":crtendS.o%s; \ ++ fvtable-verify=std:vtv_end.o%s} \ ++ %{shared|" PIE_SPEC ":crtendS.o%s; \ + :crtend.o%s} " \ + GNU_USER_TARGET_CRTN " " \ + CRTOFFLOADEND +@@ -106,7 +105,7 @@ see the files COPYING3 and COPYING.RUNTI + #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC + + #if defined(HAVE_LD_EH_FRAME_HDR) +-#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} " ++#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} " + #endif + + #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \ +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/i386/pmm_malloc.h gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/i386/pmm_malloc.h +--- a/gcc/config/i386/pmm_malloc.h 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/i386/pmm_malloc.h 2025-11-30 02:11:23.000000000 +0000 +@@ -27,12 +27,13 @@ + #include <stdlib.h> + + /* We can't depend on <stdlib.h> since the prototype of posix_memalign +- may not be visible. */ ++ may not be visible and we can't pollute the namespace either. */ + #ifndef __cplusplus +-extern int posix_memalign (void **, size_t, size_t); ++extern int _mm_posix_memalign (void **, size_t, size_t) + #else +-extern "C" int posix_memalign (void **, size_t, size_t) throw (); ++extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw () + #endif ++__asm__("posix_memalign"); + + static __inline void * + _mm_malloc (size_t __size, size_t __alignment) +@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alig + return malloc (__size); + if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4)) + __alignment = sizeof (void *); +- if (posix_memalign (&__ptr, __alignment, __size) == 0) ++ if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0) + return __ptr; + else + return NULL; +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/m68k/m68k.md gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/m68k/m68k.md +--- a/gcc/config/m68k/m68k.md 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/m68k/m68k.md 2025-11-30 02:13:02.000000000 +0000 +@@ -4174,13 +4174,13 @@ + (define_expand "sqrt<mode>2" + [(set (match_operand:FP 0 "nonimmediate_operand" "") + (sqrt:FP (match_operand:FP 1 "general_operand" "")))] +- "TARGET_HARD_FLOAT" ++ "(TARGET_68881 && TARGET_68040) || TARGET_COLDFIRE_FPU" + "") + + (define_insn "sqrt<mode>2_68881" + [(set (match_operand:FP 0 "nonimmediate_operand" "=f") + (sqrt:FP (match_operand:FP 1 "general_operand" "f<FP:dreg>m")))] +- "TARGET_68881" ++ "TARGET_68881 && TARGET_68040" + { + if (FP_REG_P (operands[1])) + return "f<FP:round>sqrt%.x %1,%0"; +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/sh/sh.cc gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/sh/sh.cc +--- a/gcc/config/sh/sh.cc 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/sh/sh.cc 2025-11-30 02:15:17.933966271 +0000 +@@ -686,6 +686,7 @@ parse_validate_atomic_model_option (cons + model_names[sh_atomic_model::hard_llcs] = "hard-llcs"; + model_names[sh_atomic_model::soft_tcb] = "soft-tcb"; + model_names[sh_atomic_model::soft_imask] = "soft-imask"; ++ model_names[sh_atomic_model::hard_cas] = "hard-cas"; + + const char* model_cdef_names[sh_atomic_model::num_models]; + model_cdef_names[sh_atomic_model::none] = "NONE"; +@@ -693,6 +694,7 @@ parse_validate_atomic_model_option (cons + model_cdef_names[sh_atomic_model::hard_llcs] = "HARD_LLCS"; + model_cdef_names[sh_atomic_model::soft_tcb] = "SOFT_TCB"; + model_cdef_names[sh_atomic_model::soft_imask] = "SOFT_IMASK"; ++ model_cdef_names[sh_atomic_model::hard_cas] = "HARD_CAS"; + + sh_atomic_model ret; + ret.type = sh_atomic_model::none; +@@ -771,6 +773,9 @@ got_mode_name:; + if (ret.type == sh_atomic_model::soft_imask && TARGET_USERMODE) + err_ret ("cannot use atomic model %s in user mode", ret.name); + ++ if (ret.type == sh_atomic_model::hard_cas && !TARGET_SHJ2) ++ err_ret ("atomic model %s is only available J2 targets", ret.name); ++ + return ret; + + #undef err_ret +@@ -827,6 +832,8 @@ sh_option_override (void) + sh_cpu = PROCESSOR_SH2E; + if (TARGET_SH2A) + sh_cpu = PROCESSOR_SH2A; ++ if (TARGET_SHJ2) ++ sh_cpu = PROCESSOR_SHJ2; + if (TARGET_SH3) + sh_cpu = PROCESSOR_SH3; + if (TARGET_SH3E) +@@ -9141,7 +9148,7 @@ legitimize_pic_address (rtx orig, machin + { + /* Weak functions may be NULL which doesn't work with + GOTOFFFUNCDESC because the runtime offset is not known. */ +- if (SYMBOL_REF_WEAK (orig)) ++ if (SYMBOL_REF_WEAK (orig) || (TREE_PUBLIC(SYMBOL_REF_DECL(orig)) && DECL_VISIBILITY (SYMBOL_REF_DECL(orig)) != VISIBILITY_HIDDEN)) + emit_insn (gen_symGOTFUNCDESC2reg (reg, orig)); + else + emit_insn (gen_symGOTOFFFUNCDESC2reg (reg, orig)); +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/sh/sh.h gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/sh/sh.h +--- a/gcc/config/sh/sh.h 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/sh/sh.h 2025-11-30 02:11:55.000000000 +0000 +@@ -85,6 +85,7 @@ extern int code_for_indirect_jump_scratc + #define SUPPORT_SH4_SINGLE 1 + #define SUPPORT_SH2A 1 + #define SUPPORT_SH2A_SINGLE 1 ++#define SUPPORT_SHJ2 1 + #endif + + #define TARGET_DIVIDE_CALL_DIV1 (sh_div_strategy == SH_DIV_CALL_DIV1) +@@ -117,6 +118,7 @@ extern int code_for_indirect_jump_scratc + #define SELECT_SH4A_SINGLE_ONLY (MASK_SH4A | SELECT_SH4_SINGLE_ONLY) + #define SELECT_SH4A (MASK_SH4A | SELECT_SH4) + #define SELECT_SH4A_SINGLE (MASK_SH4A | SELECT_SH4_SINGLE) ++#define SELECT_SHJ2 (MASK_SHJ2 | SELECT_SH2) + + #if SUPPORT_SH1 + #define SUPPORT_SH2 1 +@@ -124,6 +126,7 @@ extern int code_for_indirect_jump_scratc + #if SUPPORT_SH2 + #define SUPPORT_SH3 1 + #define SUPPORT_SH2A_NOFPU 1 ++#define SUPPORT_SHJ2 1 + #endif + #if SUPPORT_SH3 + #define SUPPORT_SH4_NOFPU 1 +@@ -156,7 +159,7 @@ extern int code_for_indirect_jump_scratc + #define MASK_ARCH (MASK_SH1 | MASK_SH2 | MASK_SH3 | MASK_SH_E | MASK_SH4 \ + | MASK_HARD_SH2A | MASK_HARD_SH2A_DOUBLE | MASK_SH4A \ + | MASK_HARD_SH4 | MASK_FPU_SINGLE \ +- | MASK_FPU_SINGLE_ONLY) ++ | MASK_FPU_SINGLE_ONLY | MASK_SHJ2) + + /* This defaults us to big-endian. */ + #ifndef TARGET_ENDIAN_DEFAULT +@@ -231,7 +234,8 @@ extern int code_for_indirect_jump_scratc + %{m2a-single:--isa=sh2a} \ + %{m2a-single-only:--isa=sh2a} \ + %{m2a-nofpu:--isa=sh2a-nofpu} \ +-%{m4al:-dsp}" ++%{m4al:-dsp} \ ++%{mj2:-isa=j2}" + + #define ASM_SPEC SH_ASM_SPEC + +@@ -347,6 +351,7 @@ struct sh_atomic_model + hard_llcs, + soft_tcb, + soft_imask, ++ hard_cas, + + num_models + }; +@@ -390,6 +395,9 @@ extern const sh_atomic_model& selected_a + #define TARGET_ATOMIC_SOFT_IMASK \ + (selected_atomic_model ().type == sh_atomic_model::soft_imask) + ++#define TARGET_ATOMIC_HARD_CAS \ ++ (selected_atomic_model ().type == sh_atomic_model::hard_cas) ++ + #endif // __cplusplus + + #define SUBTARGET_OVERRIDE_OPTIONS (void) 0 +@@ -1484,7 +1492,7 @@ extern bool current_function_interrupt; + + /* Nonzero if the target supports dynamic shift instructions + like shad and shld. */ +-#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A) ++#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A || TARGET_SHJ2) + + /* The cost of using the dynamic shift insns (shad, shld) are the same + if they are available. If they are not available a library function will +@@ -1747,6 +1755,7 @@ enum processor_type { + PROCESSOR_SH2, + PROCESSOR_SH2E, + PROCESSOR_SH2A, ++ PROCESSOR_SHJ2, + PROCESSOR_SH3, + PROCESSOR_SH3E, + PROCESSOR_SH4, +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/sh/sh.opt gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/sh/sh.opt +--- a/gcc/config/sh/sh.opt 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/sh/sh.opt 2025-11-30 02:11:55.000000000 +0000 +@@ -65,6 +65,10 @@ m2e + Target RejectNegative Condition(SUPPORT_SH2E) + Generate SH2e code. + ++mj2 ++Target RejectNegative Mask(SHJ2) Condition(SUPPORT_SHJ2) ++Generate J2 code. ++ + m3 + Target RejectNegative Mask(SH3) Condition(SUPPORT_SH3) + Generate SH3 code. +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/sh/sync.md gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/sh/sync.md +--- a/gcc/config/sh/sync.md 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/sh/sync.md 2025-11-30 02:11:55.000000000 +0000 +@@ -240,6 +240,9 @@ + || (TARGET_SH4A && <MODE>mode == SImode && !TARGET_ATOMIC_STRICT)) + atomic_insn = gen_atomic_compare_and_swap<mode>_hard (old_val, mem, + exp_val, new_val); ++ else if (TARGET_ATOMIC_HARD_CAS && <MODE>mode == SImode) ++ atomic_insn = gen_atomic_compare_and_swap<mode>_cas (old_val, mem, ++ exp_val, new_val); + else if (TARGET_ATOMIC_SOFT_GUSA) + atomic_insn = gen_atomic_compare_and_swap<mode>_soft_gusa (old_val, mem, + exp_val, new_val); +@@ -306,6 +309,57 @@ + } + [(set_attr "length" "14")]) + ++(define_expand "atomic_compare_and_swapsi_cas" ++ [(set (match_operand:SI 0 "register_operand" "=r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra") ++ (match_operand:SI 2 "register_operand" "r") ++ (match_operand:SI 3 "register_operand" "r")] ++ UNSPECV_CMPXCHG_1))] ++ "TARGET_ATOMIC_HARD_CAS" ++{ ++ rtx mem = gen_rtx_REG (SImode, 0); ++ emit_move_insn (mem, force_reg (SImode, XEXP (operands[1], 0))); ++ emit_insn (gen_shj2_cas (operands[0], mem, operands[2], operands[3])); ++ DONE; ++}) ++ ++(define_insn "shj2_cas" ++ [(set (match_operand:SI 0 "register_operand" "=&r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "register_operand" "=r") ++ (match_operand:SI 2 "register_operand" "r") ++ (match_operand:SI 3 "register_operand" "0")] ++ UNSPECV_CMPXCHG_1)) ++ (set (reg:SI T_REG) ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_CMPXCHG_3))] ++ "TARGET_ATOMIC_HARD_CAS" ++ "cas.l %2,%0,@%1" ++ [(set_attr "length" "2")] ++) ++ ++(define_expand "atomic_compare_and_swapqi_cas" ++ [(set (match_operand:SI 0 "arith_reg_dest" "=&r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra") ++ (match_operand:SI 2 "arith_operand" "rI08") ++ (match_operand:SI 3 "arith_operand" "rI08")] ++ UNSPECV_CMPXCHG_1))] ++ "TARGET_ATOMIC_HARD_CAS" ++{FAIL;} ++) ++ ++(define_expand "atomic_compare_and_swaphi_cas" ++ [(set (match_operand:SI 0 "arith_reg_dest" "=&r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra") ++ (match_operand:SI 2 "arith_operand" "rI08") ++ (match_operand:SI 3 "arith_operand" "rI08")] ++ UNSPECV_CMPXCHG_1))] ++ "TARGET_ATOMIC_HARD_CAS" ++{FAIL;} ++) ++ + ;; The QIHImode llcs patterns modify the address register of the memory + ;; operand. In order to express that, we have to open code the memory + ;; operand. Initially the insn is expanded like every other atomic insn +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config/sh/t-sh gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config/sh/t-sh +--- a/gcc/config/sh/t-sh 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config/sh/t-sh 2025-11-30 02:11:55.000000000 +0000 +@@ -50,7 +50,8 @@ MULTILIB_MATCHES = $(shell \ + m2e,m3e,m4-single-only,m4-100-single-only,m4-200-single-only,m4-300-single-only,m4a-single-only \ + m2a-single,m2a-single-only \ + m4-single,m4-100-single,m4-200-single,m4-300-single,m4a-single \ +- m4,m4-100,m4-200,m4-300,m4a; do \ ++ m4,m4-100,m4-200,m4-300,m4a \ ++ mj2; do \ + subst= ; \ + for lib in `echo $$abi|tr , ' '` ; do \ + if test "`echo $$multilibs|sed s/$$lib//`" != "$$multilibs"; then \ +@@ -63,9 +64,9 @@ MULTILIB_MATCHES = $(shell \ + + # SH1 and SH2A support big endian only. + ifeq ($(DEFAULT_ENDIAN),ml) +-MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG) ++MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* ml/mj2 $(TM_MULTILIB_EXCEPTIONS_CONFIG) + else +-MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG) ++MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* ml/mj2 $(TM_MULTILIB_EXCEPTIONS_CONFIG) + endif + + MULTILIB_OSDIRNAMES = \ +@@ -87,7 +88,8 @@ MULTILIB_OSDIRNAMES = \ + m4a-single-only=!m4a-single-only $(OTHER_ENDIAN)/m4a-single-only=!$(OTHER_ENDIAN)/m4a-single-only \ + m4a-single=!m4a-single $(OTHER_ENDIAN)/m4a-single=!$(OTHER_ENDIAN)/m4a-single \ + m4a=!m4a $(OTHER_ENDIAN)/m4a=!$(OTHER_ENDIAN)/m4a \ +- m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al ++ m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al \ ++ mj2=!j2 + + $(out_object_file): gt-sh.h + gt-sh.h : s-gtype ; @true +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/config.gcc gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/config.gcc +--- a/gcc/config.gcc 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/config.gcc 2025-11-30 02:11:55.000000000 +0000 +@@ -558,7 +558,7 @@ s390*-*-*) + extra_headers="s390intrin.h htmintrin.h htmxlintrin.h vecintrin.h" + ;; + # Note the 'l'; we need to be able to match e.g. "shle" or "shl". +-sh[123456789lbe]*-*-* | sh-*-*) ++sh[123456789lbej]*-*-* | sh-*-*) + cpu_type=sh + extra_options="${extra_options} fused-madd.opt" + extra_objs="${extra_objs} sh_treg_combine.o sh-mem.o sh_optimize_sett_clrt.o" +@@ -3179,18 +3179,18 @@ s390x-ibm-tpf*) + extra_options="${extra_options} s390/tpf.opt" + tmake_file="${tmake_file} s390/t-s390" + ;; +-sh-*-elf* | sh[12346l]*-*-elf* | \ +- sh-*-linux* | sh[2346lbe]*-*-linux* | \ ++sh-*-elf* | sh[12346lj]*-*-elf* | \ ++ sh-*-linux* | sh[2346lbej]*-*-linux* | \ + sh-*-netbsdelf* | shl*-*-netbsdelf*) + tmake_file="${tmake_file} sh/t-sh sh/t-elf" + if test x${with_endian} = x; then + case ${target} in +- sh[1234]*be-*-* | sh[1234]*eb-*-*) with_endian=big ;; ++ sh[j1234]*be-*-* | sh[j1234]*eb-*-*) with_endian=big ;; + shbe-*-* | sheb-*-*) with_endian=big,little ;; + sh[1234]l* | sh[34]*-*-linux*) with_endian=little ;; + shl* | sh*-*-linux* | \ + sh-superh-elf) with_endian=little,big ;; +- sh[1234]*-*-*) with_endian=big ;; ++ sh[j1234]*-*-*) with_endian=big ;; + *) with_endian=big,little ;; + esac + fi +@@ -3257,6 +3257,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + sh2a_nofpu*) sh_cpu_target=sh2a-nofpu ;; + sh2a*) sh_cpu_target=sh2a ;; + sh2e*) sh_cpu_target=sh2e ;; ++ shj2*) sh_cpu_target=shj2;; + sh2*) sh_cpu_target=sh2 ;; + *) sh_cpu_target=sh1 ;; + esac +@@ -3278,7 +3279,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \ + sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \ + sh4-single-only | sh4-single | sh4-nofpu | sh4 | sh4-300 | \ +- sh3e | sh3 | sh2e | sh2 | sh1) ;; ++ sh3e | sh3 | sh2e | sh2 | sh1 | shj2) ;; + "") sh_cpu_default=${sh_cpu_target} ;; + *) echo "with_cpu=$with_cpu not supported"; exit 1 ;; + esac +@@ -3287,9 +3288,9 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + case ${target} in + sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; +- sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4 ;; ++ sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4,mj2 ;; + sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; +- *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;; ++ *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single,mj2 ;; + esac + if test x$with_fp = xno; then + sh_multilibs="`echo $sh_multilibs|sed -e s/m4/sh4-nofpu/ -e s/,m4-[^,]*//g -e s/,m[23]e// -e s/m2a,m2a-single/m2a-nofpu/ -e s/m5-..m....,//g`" +@@ -3304,7 +3305,8 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + m1 | m2 | m2e | m3 | m3e | \ + m4 | m4-single | m4-single-only | m4-nofpu | m4-300 |\ + m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al | \ +- m2a | m2a-single | m2a-single-only | m2a-nofpu) ++ m2a | m2a-single | m2a-single-only | m2a-nofpu | \ ++ mj2) + # TM_MULTILIB_CONFIG is used by t-sh for the non-endian multilib definition + # It is passed to MULTIILIB_OPTIONS verbatim. + TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG}/${sh_multilib}" +@@ -3321,7 +3323,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + done + TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's:^/::'` + if test x${enable_incomplete_targets} = xyes ; then +- tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1" ++ tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SHJ2=1" + fi + tm_file="$tm_file ./sysroot-suffix.h" + tmake_file="$tmake_file t-sysroot-suffix" +@@ -5517,6 +5519,8 @@ case "${target}" in + ;; + m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al) + ;; ++ mj2) ++ ;; + *) + echo "Unknown CPU used in --with-cpu=$with_cpu, known values:" 1>&2 + echo "m1 m2 m2e m3 m3e m4 m4-single m4-single-only m4-nofpu" 1>&2 +@@ -5783,7 +5787,7 @@ case ${target} in + tmake_file="${cpu_type}/t-${cpu_type} ${tmake_file}" + ;; + +- sh[123456ble]*-*-* | sh-*-*) ++ sh[123456blej]*-*-* | sh-*-*) + c_target_objs="${c_target_objs} sh-c.o" + cxx_target_objs="${cxx_target_objs} sh-c.o" + ;; +diff -ru --no-dereference --show-c-function gcc-13.3.0/gcc/gcc.cc gcc-13.3.0-0009-sh-fdpic-pr114641/gcc/gcc.cc +--- a/gcc/gcc.cc 2024-05-21 07:47:38.000000000 +0000 ++++ b/gcc/gcc.cc 2025-11-30 02:12:28.000000000 +0000 +@@ -974,7 +974,8 @@ proper position among the other output f + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ +- "|fstack-protector-strong|fstack-protector-explicit:}" ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ + "|fstack-protector-strong|fstack-protector-explicit" \ +@@ -1003,7 +1004,7 @@ proper position among the other output f + #define NO_FPIE_AND_FPIC_SPEC NO_FPIE_SPEC "|" NO_FPIC_SPEC + #define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;" + #else +-#define PIE_SPEC "pie" ++#define PIE_SPEC "pie|static-pie" + #define FPIE1_SPEC "fpie" + #define NO_FPIE1_SPEC FPIE1_SPEC ":;" + #define FPIE2_SPEC "fPIE" +@@ -1027,12 +1028,12 @@ proper position among the other output f + #ifndef LINK_PIE_SPEC + #ifdef HAVE_LD_PIE + #ifndef LD_PIE_SPEC +-#define LD_PIE_SPEC "-pie" ++#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}" + #endif + #else + #define LD_PIE_SPEC "" + #endif +-#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " ++#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " + #endif + + #ifndef LINK_BUILDID_SPEC +diff -ru --no-dereference --show-c-function gcc-13.3.0/libgcc/crtstuff.c gcc-13.3.0-0009-sh-fdpic-pr114641/libgcc/crtstuff.c +--- a/libgcc/crtstuff.c 2024-05-21 07:47:41.000000000 +0000 ++++ b/libgcc/crtstuff.c 2025-11-30 02:14:43.000000000 +0000 +@@ -442,17 +442,9 @@ __do_global_dtors_aux (void) + #ifdef FINI_SECTION_ASM_OP + CRT_CALL_STATIC_FUNCTION (FINI_SECTION_ASM_OP, __do_global_dtors_aux) + #elif defined (FINI_ARRAY_SECTION_ASM_OP) +-#if defined(__FDPIC__) +-__asm__("\t.equ\t__do_global_dtors_aux_alias, __do_global_dtors_aux\n"); +-extern char __do_global_dtors_aux_alias; +-static void *__do_global_dtors_aux_fini_array_entry[] +-__attribute__ ((__used__, section(".fini_array"), aligned(sizeof(void *)))) +- = { &__do_global_dtors_aux_alias }; +-#else /* defined(__FDPIC__) */ + static func_ptr __do_global_dtors_aux_fini_array_entry[] + __attribute__ ((__used__, section(".fini_array"), + aligned(__alignof__(func_ptr)))) = { __do_global_dtors_aux }; +-#endif /* defined(__FDPIC__) */ + #else /* !FINI_SECTION_ASM_OP && !FINI_ARRAY_SECTION_ASM_OP */ + static void __attribute__((used)) + __do_global_dtors_aux_1 (void) +@@ -495,17 +487,9 @@ frame_dummy (void) + #ifdef __LIBGCC_INIT_SECTION_ASM_OP__ + CRT_CALL_STATIC_FUNCTION (__LIBGCC_INIT_SECTION_ASM_OP__, frame_dummy) + #else /* defined(__LIBGCC_INIT_SECTION_ASM_OP__) */ +-#if defined(__FDPIC__) +-__asm__("\t.equ\t__frame_dummy_alias, frame_dummy\n"); +-extern char __frame_dummy_alias; +-static void *__frame_dummy_init_array_entry[] +-__attribute__ ((__used__, section(".init_array"), aligned(sizeof(void *)))) +- = { &__frame_dummy_alias }; +-#else /* defined(__FDPIC__) */ + static func_ptr __frame_dummy_init_array_entry[] + __attribute__ ((__used__, section(".init_array"), + aligned(__alignof__(func_ptr)))) = { frame_dummy }; +-#endif /* defined(__FDPIC__) */ + #endif /* !defined(__LIBGCC_INIT_SECTION_ASM_OP__) */ + #endif /* USE_EH_FRAME_REGISTRY || USE_TM_CLONE_REGISTRY */ + +diff -ru --no-dereference --show-c-function gcc-13.3.0/libgcc/unwind-pe.h gcc-13.3.0-0009-sh-fdpic-pr114641/libgcc/unwind-pe.h +--- a/libgcc/unwind-pe.h 2024-05-21 07:47:41.000000000 +0000 ++++ b/libgcc/unwind-pe.h 2025-11-30 02:14:09.000000000 +0000 +@@ -262,7 +262,7 @@ read_encoded_value_with_base (unsigned c + + if (result != 0) + { +-#if __FDPIC__ ++#if __FDPIC__ && __arm__ + /* FDPIC relative addresses imply taking the GOT address + into account. */ + if ((encoding & DW_EH_PE_pcrel) && (encoding & DW_EH_PE_indirect)) diff --git a/templates/pkg/gcc b/templates/pkg/gcc @@ -1,4 +1,4 @@ -{%- set pkg_version="14.3.0" -%} +{%- set pkg_version=target_gcc_version|default("13.4.0") -%} {%- set pkg_source="tar.xz" -%} {% extends "genlinks_mini" %} {%- do import_functions.update(["build_env_static", "check_static"]) %} diff --git a/templates/pkg/musl b/templates/pkg/musl @@ -1,3 +1,4 @@ +{%- set gcc_ver=target_gcc_version|default("13.4.0") -%} {%- set pkg_version="1.2.5" -%} {%- set pkg_source="tar.gz" -%} {% extends "genlinks_mini" %} @@ -26,7 +27,7 @@ mcm={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-1")}} --build="$(${CC:-gcc} -dumpmachine)" \ CC="$mcm/bin/{{triplet}}-gcc" \ CXX="$mcm/bin/{{triplet}}-g++" \ - LIBCC="$mcm/lib/gcc/{{triplet}}/14.3.0/libgcc.a" + LIBCC="$mcm/lib/gcc/{{triplet}}/{{gcc_ver}}/libgcc.a" {%- endblock configure %} {%- block build %} diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -1,4 +1,4 @@ -{%- set gcc_ver="13.4.0" -%} +{%- set gcc_ver=target_gcc_version|default("13.4.0") -%} {%- set linux_ver="6.15.7" -%} {%- import "package_sets" as ps -%} {% extends "musl-cross-make" %} diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1 @@ -1,4 +1,4 @@ -{%- set gcc_ver="13.4.0" -%} +{%- set gcc_ver=target_gcc_version|default("13.4.0") -%} {%- set linux_ver="6.15.7" -%} {%- import "package_sets" as ps -%} {% extends "musl-cross-make" %} diff --git a/variants/ccx-x86_64.yaml b/variants/ccx-x86_64.yaml @@ -6,6 +6,8 @@ make: "make -j${JOBS:-1} -l$((1+${JOBS:-1}))" var_dir: /var/pthbs kernel: linux-qemu-guest +target_gcc_version: "13.4.0" + configdir: "config" bindir: "command" sbindir: "command" diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -49,7 +49,7 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.fd1d18fe0f991ede1c8ae22cbaa8edcbf78551accc3cf29ec403718ddda20edd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/home/ccx/versions/musl.ff00d8c397e59df9a5249df90031e8659b6d99227f33212559a601cf7248a222/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc @@ -4,13 +4,13 @@ #+gnu-make.1a6f957896d36b7ec667811e294848be32b1ccef308d8273a913fd1a2e43297f #+busybox.873753ec059e869cde64a5146815d1500844431262134d94d420720ff9872079 #+nawk.abe3790fd5e321ccd4e1ab7dab56339222e2eee686bc4b2241e7853104a4a500 -#+musl.fd1d18fe0f991ede1c8ae22cbaa8edcbf78551accc3cf29ec403718ddda20edd +#+musl.ff00d8c397e59df9a5249df90031e8659b6d99227f33212559a601cf7248a222 #+gmp.91d896a37889c6924e14bfa43cf254b905a41dabbe809c8e66fe86ea8a22bfee #+mpc.9c323c2e23836828197131d66b37fdecbfec8e6f2fcc8b14cfdfbcf4a3e82edf #+mpfr.048040b5b709a19cf4e78704d025e88815d1dbf18c23760482bbf45e0238847c -#@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch +#@sha256:b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3:merged.patch #@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esetroot.patch -#@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:. +#@untar:-J:sha256:9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5:. # - build script start - @@ -38,7 +38,7 @@ check_static() { prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'gcc-14.3.0' +cd 'gcc-13.4.0' patch -p1 <../merged.patch patch -p1 <../esetroot.patch @@ -50,7 +50,7 @@ export SOURCE_DATE_EPOCH=1748000928 mcm=/home/ccx/versions/musl-cross-make.5c7b7ca62ab75cd63e10d8c99742bd8988de3c0758bb9219f13971e7ae28e326 mcm_bin=$mcm/bin/x86_64-linux-musl binutils_cmd=/home/ccx/versions/binutils.e27b3c2c7968d0c9ecd3f1be245f3ae14f44e4eeb82cd538cfc0f96f1afc4ef0 -musl=/home/ccx/versions/musl.fd1d18fe0f991ede1c8ae22cbaa8edcbf78551accc3cf29ec403718ddda20edd +musl=/home/ccx/versions/musl.ff00d8c397e59df9a5249df90031e8659b6d99227f33212559a601cf7248a222 build_env_static sysroot="${pthbs_workdir}/sysroot" diff --git a/variants/ccx-x86_64/musl b/variants/ccx-x86_64/musl @@ -28,7 +28,7 @@ mcm=/home/ccx/versions/musl-cross-make.5c7b7ca62ab75cd63e10d8c99742bd8988de3c075 --build="$(${CC:-gcc} -dumpmachine)" \ CC="$mcm/bin/x86_64-linux-musl-gcc" \ CXX="$mcm/bin/x86_64-linux-musl-g++" \ - LIBCC="$mcm/lib/gcc/x86_64-linux-musl/14.3.0/libgcc.a" + LIBCC="$mcm/lib/gcc/x86_64-linux-musl/13.4.0/libgcc.a" make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ MULTILIB_OSDIRNAMES= \ diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring @@ -30,10 +30,10 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -30,9 +30,9 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 -#+ocaml_intrinsics_kernel.70c20b76571b58c64f9457919a6f0e65f68a1bdd4fd234491d44c87260e274cb -#+ocaml-sexplib0.fce0ea7d6c9e6fdbc49726471cc5dd545db067e5a3b1112eeb5cea59d83677fa +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b +#+ocaml_intrinsics_kernel.033449a330757c5a26d92fa05ed694779a9109e737001065444984ce92b84c7e +#+ocaml-sexplib0.454878d72fb64b9f0e47b0a1655375b649fca03e5d0fce066509660e9332701b #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos @@ -30,16 +30,16 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 -#+ocaml-astring.6fb53e70c48bf5c5d61fd14f5848704662f87c7b65f06fa1401d3145a5b772e6 -#+ocaml-fpath.d7db458039e47a79eb1b2a16a602a10ccab907e6b5098043b1a545a35f51dc4c -#+ocaml-rresult.1d8177a13ed4c31e7150f6755cab598da7c461c5c41fa73280c8e761315d66e9 -#+ocaml-fmt.a25a0a9a9c125763f86dca47045196b4476765b0115a0cc2cfc27c5992edc4a8 -#+ocaml-logs.4dac4a167040b0cc839d632ca090646832918d04ef7da73f2030ed0217193f8b -#+ocaml-mtime.69bc687629786cc6542d92112c187628b3acc1576a98ee4930e4db7221fc67c6 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 +#+ocaml-astring.6c13352bb161233647b8c83a4664ff9c88e3f1035a4060ed5a1f96381057fbe7 +#+ocaml-fpath.32de907ac93c693f9dd741b01adb501286700087f1250f2b9622be174ef2d3cd +#+ocaml-rresult.020d2f71c78366722f8b939fd886f641c33ffe995e24b8acde2185b3130e52ee +#+ocaml-fmt.fda9e36846b3a173889fb28b59f637a7d1444e90054e1017c2253c52568d7e35 +#+ocaml-logs.0610f209dea4d7d9beb40a212e1a1bf12395ad4ece2581316382dd6b9a7f51e6 +#+ocaml-mtime.9050c7c3de44a426cfe6944356b9bd8a63731a495f82e47e7bcb52d8702994bd #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner @@ -30,10 +30,10 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs @@ -30,7 +30,7 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo @@ -30,8 +30,8 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib @@ -33,7 +33,7 @@ #+m4.b4ee3ac839a0d1c413ca957480a41b42d47d90db2fa4e0b6f1ecf88f575def61 #+netbsd-curses.731fb93399939e830744008cc30249caf4a937b0d8e1e7de13fd50b9bd3d63ae #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -53,7 +53,7 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.fd1d18fe0f991ede1c8ae22cbaa8edcbf78551accc3cf29ec403718ddda20edd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/home/ccx/versions/musl.ff00d8c397e59df9a5249df90031e8659b6d99227f33212559a601cf7248a222/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt @@ -30,11 +30,11 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 -#+ocaml-cmdliner.0ff9274c6d0b0b65b73ccd6832504fa83ce7a3d014e444019a7eb7e512d40f9a +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 +#+ocaml-cmdliner.b471e4f42186d2f15fffc3b30ac8adf4287e9cb3d0976f391f0063c8361a31fc #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath @@ -30,11 +30,11 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 -#+ocaml-astring.6fb53e70c48bf5c5d61fd14f5848704662f87c7b65f06fa1401d3145a5b772e6 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 +#+ocaml-astring.6c13352bb161233647b8c83a4664ff9c88e3f1035a4060ed5a1f96381057fbe7 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs @@ -30,13 +30,13 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 -#+ocaml-mtime.69bc687629786cc6542d92112c187628b3acc1576a98ee4930e4db7221fc67c6 -#+ocaml-cmdliner.0ff9274c6d0b0b65b73ccd6832504fa83ce7a3d014e444019a7eb7e512d40f9a -#+ocaml-fmt.a25a0a9a9c125763f86dca47045196b4476765b0115a0cc2cfc27c5992edc4a8 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 +#+ocaml-mtime.9050c7c3de44a426cfe6944356b9bd8a63731a495f82e47e7bcb52d8702994bd +#+ocaml-cmdliner.b471e4f42186d2f15fffc3b30ac8adf4287e9cb3d0976f391f0063c8361a31fc +#+ocaml-fmt.fda9e36846b3a173889fb28b59f637a7d1444e90054e1017c2253c52568d7e35 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun @@ -30,7 +30,7 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime @@ -30,10 +30,10 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers @@ -30,7 +30,7 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving @@ -30,14 +30,14 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 -#+ocaml-compiler-libs.e87cd4bc7f0fc6460c59315076a44c3d8aa815cc2817ec13b451ea38d1812e3d -#+ocaml-cppo.353bac61b9e1a82c8b7359088c0ae7f126896d15cc0919ddc1c61a3e0768a7a2 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocaml-ppx_derivers.a5b0b3f76b8026e3a74d563596a1c7d451ebbfc83d31eecb4d65a80d21b5966d -#+ocaml-ppxlib.33c5d2b79f54e95bc9e70898b01fbb1b715343a51281070defa323e095b8746d -#+ocaml-sexplib0.fce0ea7d6c9e6fdbc49726471cc5dd545db067e5a3b1112eeb5cea59d83677fa -#+ocaml-stdlib-shims.a62c6f08820b280973e6725f390557a8e772742a2400d71938d68ac6c5eb2236 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b +#+ocaml-compiler-libs.b5f151a68299469b86a1d86295ad03e02919724e9d6a876426cb15fd1efcd42f +#+ocaml-cppo.d3b59d272a6d13a49aaf1524fe685e934aa42b6b735f0fb2717da067c3d4ea72 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocaml-ppx_derivers.3dd967a2a3b517f78fdfb6e8e82f636cecc703a6b4d6f00351d1e46569b15068 +#+ocaml-ppxlib.2b3d291557de655074630923dcfeb962c8b8959e17549e8f942f1878e8a2abc7 +#+ocaml-sexplib0.454878d72fb64b9f0e47b0a1655375b649fca03e5d0fce066509660e9332701b +#+ocaml-stdlib-shims.8aec41adb55dffef7e7c919286e8d1cbcabb6f99b0a50bfb7f0727292180f77c #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib @@ -30,11 +30,11 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 -#+ocaml-compiler-libs.e87cd4bc7f0fc6460c59315076a44c3d8aa815cc2817ec13b451ea38d1812e3d -#+ocaml-ppx_derivers.a5b0b3f76b8026e3a74d563596a1c7d451ebbfc83d31eecb4d65a80d21b5966d -#+ocaml-sexplib0.fce0ea7d6c9e6fdbc49726471cc5dd545db067e5a3b1112eeb5cea59d83677fa -#+ocaml-stdlib-shims.a62c6f08820b280973e6725f390557a8e772742a2400d71938d68ac6c5eb2236 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b +#+ocaml-compiler-libs.b5f151a68299469b86a1d86295ad03e02919724e9d6a876426cb15fd1efcd42f +#+ocaml-ppx_derivers.3dd967a2a3b517f78fdfb6e8e82f636cecc703a6b4d6f00351d1e46569b15068 +#+ocaml-sexplib0.454878d72fb64b9f0e47b0a1655375b649fca03e5d0fce066509660e9332701b +#+ocaml-stdlib-shims.8aec41adb55dffef7e7c919286e8d1cbcabb6f99b0a50bfb7f0727292180f77c #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult @@ -30,10 +30,10 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-topkg.5bc8d2b42e7ff45a7b91bd207696bb2f3c7a3bff6b42e437488cfabba6fa8894 +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-topkg.2527453b9443e26d51f0564aa615d5a273d1086a2e54a3f5affc3404332a2892 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0 @@ -30,7 +30,7 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims @@ -30,7 +30,7 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg @@ -30,9 +30,9 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+ocaml-findlib.a7497e291daad0493f7f026aa5a10806a749f40d4e0f0d74b799ebff5e73f357 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d +#+ocaml-findlib.c3f8b6c2dce694142abfd5b2f52c55875980b8ed540097123bb942f3fe0db627 +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/ccx-x86_64/ocaml.environment b/variants/ccx-x86_64/ocaml.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 -#+ocamlbuild.de3ac6564bfe9000eca097134c82984b0bb82aa2c0d68f05e9058a1849a4b60b -#+ocaml-base.d1fde15c3a5695bf3b232fb8c0a9c96358d91dff6d7686c96b785ad7979b2c3d -#+opam.57b14d5f97b6148bb9406935fe680a0e87957632a9c2ec2a656760a8e18b9c4d -#+ocaml-bos.d5c94163015285413439464f0b107a3e86d5a04c0e7098cf5a6e395d87c04726 -#+ocaml-lun.434b94e1221b46edda49d9f1f0205ff7be4cf0cd09eb79a61c98df1fa4295cd3 -#+ocaml-ppx_deriving.211aeb183b3d45c7483f79f838e2f092cefbaa9bec2e33444dc0ad8566e05729- \ No newline at end of file +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b +#+ocamlbuild.ea6a89cd5f41ae3595b6c3588142ede32005fd2dd71ea8099c8a17bb774c5376 +#+ocaml-base.73f03755eb97c66c77cf4455fc35018d1c3d56b6a5927667ffc2d0d4616b568a +#+opam.1b24c8ebc3a6ef3c47064cf9d1374820ca92a0ee2b552ee6937422c06d474e81 +#+ocaml-bos.ea44307af760c2c0851a36b698994fddb3029d821bfd46569a5e4302c907af08 +#+ocaml-lun.b1f9210bff432a5966d3ccfd31073e3d4b1c6f9cd03b386bdd37a474ef11f89d +#+ocaml-ppx_deriving.60d70b4d0261db521faaee10152afb6187f01e67b1659ec9bf27904c1ca391c7+ \ No newline at end of file diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel @@ -30,7 +30,7 @@ #+busybox-diffutils.0a81b58201a458e4674ee56b7c8668a5355dcdeadb30d1aa1b8a2ec10ce86a34 #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild @@ -51,7 +51,7 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.fd1d18fe0f991ede1c8ae22cbaa8edcbf78551accc3cf29ec403718ddda20edd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/home/ccx/versions/musl.ff00d8c397e59df9a5249df90031e8659b6d99227f33212559a601cf7248a222/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -33,7 +33,7 @@ #+musl-cross-make.ce36da884613d7ccbae7bff3bd46723262d61e41da8ec192eb02e3a7b0d36e58 #+getconf.0e97f1ee868d92844ec37cd6fd88c48147cd819bc2e1ef2ca87e7b1cb04b815f #+ocaml.60260cf4c8393c4783a4244f2ee9fc424e9646c799a609be99c32ce2e7ffb585 -#+dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801 +#+dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -72,7 +72,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/home/ccx/versions/dune.903d6f44e254e001d3a79a7de2cc81283bace679747710e784bdbae07b29f801/command/dune' \ + --with-dune='/home/ccx/versions/dune.9ee99a84b845462b7b048f54a3c2ae925e87e1ea2d96f8b4f56fb3e18bfd1f7b/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-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.fd1d18fe0f991ede1c8ae22cbaa8edcbf78551accc3cf29ec403718ddda20edd -#+gcc.398119306fcb974d3f119f77428448a269d5c99e78ef684cad9f8bd9dca47c3b +#+musl.ff00d8c397e59df9a5249df90031e8659b6d99227f33212559a601cf7248a222 +#+gcc.098ed73b9dbca4df1dead0719e73381d0cc86bc812de8459155b2548b2503f8a #+binutils.e27b3c2c7968d0c9ecd3f1be245f3ae14f44e4eeb82cd538cfc0f96f1afc4ef0 \ No newline at end of file diff --git a/variants/root-x86_64.yaml b/variants/root-x86_64.yaml @@ -5,6 +5,8 @@ make: "make -j${JOBS:-1} -l$((1+${JOBS:-1}))" #etc_dir: /home/ccx/.local/etc var_dir: /var/pthbs +target_gcc_version: "13.4.0" + configdir: "config" bindir: "command" sbindir: "command" diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -49,7 +49,7 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.18fa00dd4c8f08f84e1a01a65c848592d8599cde1a2586363625dc8e3bc58e60/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/versions/musl.706a8050a73f3075d4e81dcbfeddeff446dcac8ba7320544adcf9c3705d88960/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc @@ -4,13 +4,13 @@ #+gnu-make.6e725cf6b697f11e815df7887aa30333aa2b814c33766f15d15b346a2517bb5e #+busybox.1734a92160528b69651485f9a4f5e2317166e184c1033dd56a3a8464d959565f #+nawk.596c1948e96cbcabfe3954a70deb947de0c73be1ddde41fafe8291bfec04bdd4 -#+musl.18fa00dd4c8f08f84e1a01a65c848592d8599cde1a2586363625dc8e3bc58e60 +#+musl.706a8050a73f3075d4e81dcbfeddeff446dcac8ba7320544adcf9c3705d88960 #+gmp.ceea1f97ebaebfa0ac9bc0c2d4188fcfa5952f867edad779843da7bb6b495c90 #+mpc.7cf67a2fe6cf12db441535a15c4e5927fc9f4f6f1998eb737ffd67b7f4203afa #+mpfr.7d6789d39bedae2d537a23c4477da26fcd896338d684619e5331ffe89e35a5e0 -#@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch +#@sha256:b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3:merged.patch #@sha256:c84acd325d75a23a74209cf15a184da7663b7eaa40048f4925ebf028ae3e16f1:esetroot.patch -#@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:. +#@untar:-J:sha256:9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5:. # - build script start - @@ -38,7 +38,7 @@ check_static() { prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'gcc-14.3.0' +cd 'gcc-13.4.0' patch -p1 <../merged.patch patch -p1 <../esetroot.patch @@ -50,7 +50,7 @@ export SOURCE_DATE_EPOCH=1748000928 mcm=/versions/musl-cross-make.698e9b72c3538800615378117b77240782ab23407f5ca44fad5599d1cfa8b762 mcm_bin=$mcm/bin/x86_64-linux-musl binutils_cmd=/versions/binutils.06634a7c6783445d52e5e45894b0c379f5be4df44124169e50096929bef7b5ee -musl=/versions/musl.18fa00dd4c8f08f84e1a01a65c848592d8599cde1a2586363625dc8e3bc58e60 +musl=/versions/musl.706a8050a73f3075d4e81dcbfeddeff446dcac8ba7320544adcf9c3705d88960 build_env_static sysroot="${pthbs_workdir}/sysroot" diff --git a/variants/root-x86_64/musl b/variants/root-x86_64/musl @@ -28,7 +28,7 @@ mcm=/versions/musl-cross-make.698e9b72c3538800615378117b77240782ab23407f5ca44fad --build="$(${CC:-gcc} -dumpmachine)" \ CC="$mcm/bin/x86_64-linux-musl-gcc" \ CXX="$mcm/bin/x86_64-linux-musl-g++" \ - LIBCC="$mcm/lib/gcc/x86_64-linux-musl/14.3.0/libgcc.a" + LIBCC="$mcm/lib/gcc/x86_64-linux-musl/13.4.0/libgcc.a" make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ MULTILIB_OSDIRNAMES= \ diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring @@ -30,10 +30,10 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -30,9 +30,9 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 -#+ocaml_intrinsics_kernel.bc93f37802f17150a0339996ceec9df24fcfa947d8df9a825ad4587038e19202 -#+ocaml-sexplib0.f3da8a4bb29b629489233d433e9c919f291a5042ed8e958b068aba4afe3a1495 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 +#+ocaml_intrinsics_kernel.fefa0b3457a14a938f6c925b48b5efa9d6c8afe0f4b47b711bffca878e75b205 +#+ocaml-sexplib0.aad275a53a7d383a057113ddae299c43c305fc10a3df6af59c0c68027000188d #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos @@ -30,16 +30,16 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb -#+ocaml-astring.b121933fe75058693147526ca2ee69b22818c97af41525025d48933b8031488b -#+ocaml-fpath.05f8fc4aa2d38e773473d49f8464d0d2d29e69ac29431ca610e764586a7c410c -#+ocaml-rresult.bae369f54bb84779c81adc8d504e7ee71ac77c0321236299ac19774cac2b1ad6 -#+ocaml-fmt.3da2fa97ddf0ea617728e0905a991d876687abf183147ec705191cdc3695f589 -#+ocaml-logs.adc887cbce5f978809f0c56a6e411b96474a83ec0be7e2ae9e4d40972469b1ae -#+ocaml-mtime.78795555f50e9564aa774bc10b674d5439288b41fffdc3f8804aca01aa1f9e0d +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 +#+ocaml-astring.0000249e82713e53698e468c594c598b7fb1f678436a99a47f00ff14e703ac67 +#+ocaml-fpath.c2060aa2c3fc98069a376135d836b306eeb8c1825cd18ef851d967d82e2219b4 +#+ocaml-rresult.d28ffbf6c24ea4e1911acd6475689bd9a18a5fe634c934a84365fcb45282f0df +#+ocaml-fmt.aa5ddadc55a89f9ae6ef1284999c875b3d4d6ec97eb3ba5beaeea336bd40d2fd +#+ocaml-logs.20e1a08976677261311b5d8ed04fc0e8fba6293e14cb5e4469093de7dee978b2 +#+ocaml-mtime.654d3f8a39a870ea9a3f80320e12caf12961a8f31234f7e08be1d33abaea694a #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner @@ -30,10 +30,10 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs @@ -30,7 +30,7 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo @@ -30,8 +30,8 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib @@ -33,7 +33,7 @@ #+m4.5444d975051858eb9505fda2fdf167fff3e3baacab2923ddc2ca7d93c3da5b54 #+netbsd-curses.b4dc473a0bb5f5d8b68ad7d7701fa91801f673c59d8719d1cc8b2be986aec9e8 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -53,7 +53,7 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.18fa00dd4c8f08f84e1a01a65c848592d8599cde1a2586363625dc8e3bc58e60/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/versions/musl.706a8050a73f3075d4e81dcbfeddeff446dcac8ba7320544adcf9c3705d88960/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt @@ -30,11 +30,11 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb -#+ocaml-cmdliner.e7d890fc91f2e9af8c14f7f3fa36e687c20770f93970c08ab936bc50dd80e79b +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 +#+ocaml-cmdliner.51dff487b1d20294d9716678de20b1434b89bfa09d85a1b154a8bcdf2a934198 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath @@ -30,11 +30,11 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb -#+ocaml-astring.b121933fe75058693147526ca2ee69b22818c97af41525025d48933b8031488b +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 +#+ocaml-astring.0000249e82713e53698e468c594c598b7fb1f678436a99a47f00ff14e703ac67 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs @@ -30,13 +30,13 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb -#+ocaml-mtime.78795555f50e9564aa774bc10b674d5439288b41fffdc3f8804aca01aa1f9e0d -#+ocaml-cmdliner.e7d890fc91f2e9af8c14f7f3fa36e687c20770f93970c08ab936bc50dd80e79b -#+ocaml-fmt.3da2fa97ddf0ea617728e0905a991d876687abf183147ec705191cdc3695f589 +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 +#+ocaml-mtime.654d3f8a39a870ea9a3f80320e12caf12961a8f31234f7e08be1d33abaea694a +#+ocaml-cmdliner.51dff487b1d20294d9716678de20b1434b89bfa09d85a1b154a8bcdf2a934198 +#+ocaml-fmt.aa5ddadc55a89f9ae6ef1284999c875b3d4d6ec97eb3ba5beaeea336bd40d2fd #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun @@ -30,7 +30,7 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime @@ -30,10 +30,10 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers @@ -30,7 +30,7 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving @@ -30,14 +30,14 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 -#+ocaml-compiler-libs.2ffa95333e129a2553164a0c19b59f7bc66c853fd4a45ba5e7bfeb161b8f822f -#+ocaml-cppo.6337362f1ab2be09c2ec38cc0204cc7212d95cc45c6b61cf435a65284cf32208 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocaml-ppx_derivers.fc58690eed42ac7b8d95d82a71ab0200a119a3e2378a7d7b90f1aa0874a4f73a -#+ocaml-ppxlib.e388373badbe78217d5bcdc7377aa05fd0d3049bf49498336ffd3bdc8f1fad79 -#+ocaml-sexplib0.f3da8a4bb29b629489233d433e9c919f291a5042ed8e958b068aba4afe3a1495 -#+ocaml-stdlib-shims.6649852985954bf39e0764ebdbc08e946fe8a46da03c96fd68ee24931fbf3115 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 +#+ocaml-compiler-libs.c8f224e4beeaa0f6afd3fdd8489d43ac111528fb28edebe32dd305bf33c6dac0 +#+ocaml-cppo.eb42c6bfb53f017db9c19865e45ea1d733aa77524b0f47dc0287433af3431a71 +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocaml-ppx_derivers.3beb21e85439e18b3e6b857fe468e9f73ad00c9ebae3d7303b8a6820a89f5f13 +#+ocaml-ppxlib.20faa33f06cc793b30b0b6bd0b4f5dc5471ee12c8a995e8c2601d620fe632af7 +#+ocaml-sexplib0.aad275a53a7d383a057113ddae299c43c305fc10a3df6af59c0c68027000188d +#+ocaml-stdlib-shims.746d1ede7a34e528543da0d694cf3a0700f3835941e50ab92e01b1129a584535 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib @@ -30,11 +30,11 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 -#+ocaml-compiler-libs.2ffa95333e129a2553164a0c19b59f7bc66c853fd4a45ba5e7bfeb161b8f822f -#+ocaml-ppx_derivers.fc58690eed42ac7b8d95d82a71ab0200a119a3e2378a7d7b90f1aa0874a4f73a -#+ocaml-sexplib0.f3da8a4bb29b629489233d433e9c919f291a5042ed8e958b068aba4afe3a1495 -#+ocaml-stdlib-shims.6649852985954bf39e0764ebdbc08e946fe8a46da03c96fd68ee24931fbf3115 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 +#+ocaml-compiler-libs.c8f224e4beeaa0f6afd3fdd8489d43ac111528fb28edebe32dd305bf33c6dac0 +#+ocaml-ppx_derivers.3beb21e85439e18b3e6b857fe468e9f73ad00c9ebae3d7303b8a6820a89f5f13 +#+ocaml-sexplib0.aad275a53a7d383a057113ddae299c43c305fc10a3df6af59c0c68027000188d +#+ocaml-stdlib-shims.746d1ede7a34e528543da0d694cf3a0700f3835941e50ab92e01b1129a584535 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult @@ -30,10 +30,10 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-topkg.d46fa58c352abae8683f6df2e0b51ccb6ea5fa104cf5fe00057aaf8235092fbb +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-topkg.ff9bc5be1dbe6a0bea33a9f9b1ed55d56edfb6e49e331074ce82e377824c8131 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0 @@ -30,7 +30,7 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims @@ -30,7 +30,7 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg @@ -30,9 +30,9 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+ocaml-findlib.9257d36929d705411b4c71bf258e01601f08bb4525e1a87d9f8e55b84b84d8b0 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda +#+ocaml-findlib.3cb5cd25194254909081c17cf38bd8b7af11a801151d4b46fb55347fc36a5f94 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/root-x86_64/ocaml.environment b/variants/root-x86_64/ocaml.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 -#+ocamlbuild.6e91af3a92154e031c09ec4596917aab33d6eff3e979113c096a690136f1e046 -#+ocaml-base.39e5898a3a73e509826eaa14792bd7b628b772611c27504c8ac618982b9f0dfe -#+opam.35973230a0019744503a6d58da1f3fe334743ec50e7953f02a9d7e9f14f8edda -#+ocaml-bos.0ccfeeb9b89c35fadb7c65c7b8b6d795b16f596372d524d954333e8ad50e9201 -#+ocaml-lun.fbfe6fb588c38fef36ee9a78ce2a55864100169ced3e639fa438ba563214cd27 -#+ocaml-ppx_deriving.a5984a8b09917ca6183aa0140adebac5de146a9c05898b71217c8808bea1edc6- \ No newline at end of file +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 +#+ocamlbuild.8d1a17c0e94515a331470884d735ef09b8d5f3e260c5acc622b26058d640a6e7 +#+ocaml-base.cb2dd8139c2d3c183cf6813f7bdc1b02ce6d90c3c4e5a0fed10e8fdac6518080 +#+opam.39592d9f4c1f92f6d369b281f1e9ccdb6ffa1d435e3ba4ae41e550900f37c456 +#+ocaml-bos.3d1ca27bdcf871d34da0880da09a08a9c726e7618758003697df367cf974ef07 +#+ocaml-lun.bfe7403860f3f2c6a255e0ac6dc5f4669363548c9d74046b664736833d48d39b +#+ocaml-ppx_deriving.1aae9f492aaf74b29bbaaebce0250d55aed00700ac51c792d36e6eef6deb554a+ \ No newline at end of file diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel @@ -30,7 +30,7 @@ #+busybox-diffutils.fd608d0382ef5e7ee1c878a26c5b979ed081b123684b5919553258f493bc8b0e #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild @@ -51,7 +51,7 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.18fa00dd4c8f08f84e1a01a65c848592d8599cde1a2586363625dc8e3bc58e60/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/versions/musl.706a8050a73f3075d4e81dcbfeddeff446dcac8ba7320544adcf9c3705d88960/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -33,7 +33,7 @@ #+musl-cross-make.428b266a6a06fafb74f5641a489fb9643abce189d1d77b9c4f846728ec48d1a5 #+getconf.60c200d6004f5993fa1b2df615efafbfbc53ff6a2b0dd0f3773c95f64d3cc49d #+ocaml.03c3dfb619b4583bd9f4f7ccd88dbddcdb1e8e4d2137472635194fecf9c21677 -#+dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98 +#+dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -72,7 +72,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/versions/dune.c7e6d892ea0c85efdcc09dcde0022177babe26d3da60b2676387be42385a3e98/command/dune' \ + --with-dune='/versions/dune.f3b7782d98c45dace016a3d2ae078506484482367f57128e1b91e9e39658ce01/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-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.18fa00dd4c8f08f84e1a01a65c848592d8599cde1a2586363625dc8e3bc58e60 -#+gcc.af8eec1f35c0ad5ae4419f8eacc79c030ad168d2c39d7c8ab208d5ca8de6d6ca +#+musl.706a8050a73f3075d4e81dcbfeddeff446dcac8ba7320544adcf9c3705d88960 +#+gcc.ba4fb5696dbee5e798f01b827f5681f945d5beb7af245e476e7f6cb6b06f9caf #+binutils.06634a7c6783445d52e5e45894b0c379f5be4df44124169e50096929bef7b5ee \ No newline at end of file