provide csdp-6.1.1 for arm64-darwin, rebuild linux and macos binaries on current platforms, but retain x64_64-windows binary;
enforce rebuild of Isabelle/ML;
--- a/Admin/components/components.sha1 Sat Sep 13 17:47:57 2025 +0200
+++ b/Admin/components/components.sha1 Sat Sep 13 19:03:19 2025 +0200
@@ -28,6 +28,7 @@
e7ffe4238b61a3c1ee87aca4421e7a612e09b836 ci-extras-1.tar.gz
81ff56cd379744d1965425c7624feefffdf381eb ci-extras-2.tar.gz
e880f31f59bd403fb72fcd3b5afb413c3831a21c csdp-6.1-1.tar.gz
+4066aa6324570331b6e7229ec234d020ff7b6554 csdp-6.1.1-1.tar.gz
2659100ba8e28e7cb0ecb554178ee5315d4a87f5 csdp-6.1.1.tar.gz
a2bd94f4f9281dc70dfda66cf28016c2ffef7ed7 csdp-6.1.tar.gz
ec17080269737e4a97b4424a379924c09b338ca2 csdp-6.2.0.tar.gz
--- a/Admin/components/main Sat Sep 13 17:47:57 2025 +0200
+++ b/Admin/components/main Sat Sep 13 19:03:19 2025 +0200
@@ -2,7 +2,7 @@
gnu-utils-20211030
bash_process-20240326
bib2xhtml-20190409
-csdp-6.1.1
+csdp-6.1.1-1
cvc5-1.2.0-1
e-3.2
elm-0.19.1
--- a/src/Pure/Admin/component_csdp.scala Sat Sep 13 17:47:57 2025 +0200
+++ b/src/Pure/Admin/component_csdp.scala Sat Sep 13 19:03:19 2025 +0200
@@ -39,6 +39,9 @@
Flags("x86_64-linux",
CFLAGS = "-O3 -ansi -Wall -DNOSHORTS -DBIT64 -DUSESIGTERM -DUSEGETTIME -I../include",
LIBS = "-static -L../lib -lsdp -llapack -lblas -lgfortran -lquadmath -lm"),
+ Flags("arm64-darwin",
+ CFLAGS = "-O3 -Wall -DNOSHORTS -DBIT64 -DUSESIGTERM -DUSEGETTIME -I../include",
+ LIBS = "-L../lib -lsdp -llapack -lblas -lm"),
Flags("x86_64-darwin",
CFLAGS = "-O3 -Wall -DNOSHORTS -DBIT64 -DUSESIGTERM -DUSEGETTIME -I../include",
LIBS = "-L../lib -lsdp -llapack -lblas -lm"),
@@ -80,7 +83,7 @@
/* platform */
- val platform_name = Isabelle_Platform.local.ISABELLE_PLATFORM(windows = true)
+ val platform_name = Isabelle_Platform.local.ISABELLE_PLATFORM(windows = true, apple = true)
val platform_dir =
Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
@@ -128,7 +131,7 @@
/* settings */
component_dir.write_settings("""
-ISABELLE_CSDP="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-$ISABELLE_PLATFORM64}/csdp"
+ISABELLE_CSDP="$COMPONENT/"${ISABELLE_WINDOWS_PLATFORM64:-${ISABELLE_APPLE_PLATFORM64:-$ISABELLE_PLATFORM64}}"/csdp"
""")
--- a/src/Pure/ROOT.ML Sat Sep 13 17:47:57 2025 +0200
+++ b/src/Pure/ROOT.ML Sat Sep 13 19:03:19 2025 +0200
@@ -1,6 +1,6 @@
(* Title: Pure/ROOT.ML
Author: Makarius
- UUID: 0c987f3d-82bb-46e8-87eb-1fa283759a7d
+ UUID: 6edfab53-c9fc-4aa9-b322-5c8796158d5d
Main entry point for the Isabelle/Pure bootstrap process.