From 2035966e58e9bc828ee0a90727bd199da7304bff Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 19 Dec 2024 07:45:51 +0100 Subject: [PATCH 1/3] gitlab-ci: add `x86_64` to Intel macOS tag sets --- .gitlab-ci.yml | 4 ++-- .gitlab/os-macos.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4676d27a..940a9f5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -198,7 +198,7 @@ macos-x86_64:build: - .macos_x86_64 - .cmake_build_macos - .cmake_build_artifacts - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_manually timeout: 3 hours @@ -207,7 +207,7 @@ macos-x86_64:test: - .macos_x86_64 - .cmake_test_macos - .cmake_package_artifacts - - .macos_builder_tags_test + - .macos_x86_64_builder_tags_test - .run_automatically needs: - macos-x86_64:build diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 5e0906ce..0cb5dec2 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -37,7 +37,7 @@ ## Tags -.macos_builder_tags: +.macos_x86_64_builder_tags: tags: - paraview - macos-x86_64 @@ -55,7 +55,7 @@ - nonconcurrent - finder -.macos_builder_tags_test: +.macos_x86_64_builder_tags_test: tags: - paraview - macos-x86_64 -- GitLab From bdbd2a8e534cf8d2824f3a54294275da79a47dc0 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 19 Dec 2024 07:45:11 +0100 Subject: [PATCH 2/3] ci: use Xcode 16.1 --- .gitlab/os-macos.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 0cb5dec2..66f53767 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -8,7 +8,7 @@ GIT_CLONE_PATH: "$CI_BUILDS_DIR/paraview-ci-ext/$CI_CONCURRENT_ID" # TODO: Factor this out so that each job selects the Xcode version to # use so that different versions can be tested in a single pipeline. - DEVELOPER_DIR: "/Applications/Xcode-14.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-16.1.app/Contents/Developer" ### Build and test @@ -42,7 +42,7 @@ - paraview - macos-x86_64 - shell - - xcode-14.2 + - xcode-16.1 - nonconcurrent - finder @@ -51,7 +51,7 @@ - paraview - macos-arm64 - shell - - xcode-14.2 + - xcode-16.1 - nonconcurrent - finder @@ -60,7 +60,7 @@ - paraview - macos-x86_64 - shell - - xcode-14.2 + - xcode-16.1 - nonconcurrent .macos_arm64_builder_tags_test: @@ -68,7 +68,7 @@ - paraview - macos-arm64 - shell - - xcode-14.2 + - xcode-16.1 - nonconcurrent ## macOS-specific scripts -- GitLab From 23721cb91568b60abdb5726546315b6ad78bf1a5 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Jan 2025 22:45:05 +0100 Subject: [PATCH 3/3] gmsh: add more missing `` includes --- projects/apple-unix/gmsh.cmake | 1 + .../patches/gmsh-string-includes.patch | 82 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 projects/apple-unix/patches/gmsh-string-includes.patch diff --git a/projects/apple-unix/gmsh.cmake b/projects/apple-unix/gmsh.cmake index 7c0fd967..5706734f 100644 --- a/projects/apple-unix/gmsh.cmake +++ b/projects/apple-unix/gmsh.cmake @@ -15,3 +15,4 @@ superbuild_add_project(gmsh -DENABLE_BUILD_SHARED:BOOL=${BUILD_SHARED_LIBS}) superbuild_apply_patch(gmsh stdint-includes "Missing stdint.h include") +superbuild_apply_patch(gmsh string-includes "Missing string.h include") diff --git a/projects/apple-unix/patches/gmsh-string-includes.patch b/projects/apple-unix/patches/gmsh-string-includes.patch new file mode 100644 index 00000000..6066f8e0 --- /dev/null +++ b/projects/apple-unix/patches/gmsh-string-includes.patch @@ -0,0 +1,82 @@ +diff -u -Nr -U5 gmsh-4.11.1-source/contrib/blossom/concorde97/EDGEGEN/edgegen.c gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/EDGEGEN/edgegen.c +--- gmsh-4.11.1-source/contrib/blossom/concorde97/EDGEGEN/edgegen.c 2020-09-08 20:07:54.000000000 +0200 ++++ gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/EDGEGEN/edgegen.c 2025-01-07 22:25:51.959098017 +0100 +@@ -87,10 +87,12 @@ + #include "edgegen.h" + #include "kdtree.h" + #include "linkern.h" + #include "fmatch.h" + ++#include ++ + #define SWAP(x,y,t) ((t)=(x),(x)=(y),(y)=(t)) + + typedef struct intptr { + int this; + struct intptr *next; +diff -u -Nr -U5 gmsh-4.11.1-source/contrib/blossom/concorde97/TSP/prob_io.c gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/TSP/prob_io.c +--- gmsh-4.11.1-source/contrib/blossom/concorde97/TSP/prob_io.c 2020-09-08 20:07:54.000000000 +0200 ++++ gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/TSP/prob_io.c 2025-01-07 22:29:56.246186706 +0100 +@@ -69,10 +69,12 @@ + #include "machdefs.h" + #include "util.h" + #include "tsp.h" + #include "bigguy.h" + ++#include ++ + #ifdef CC_PROTOTYPE_ANSI + + static int + prob_name (char *buf, int buflen, char *f, int n), + write_header (CCtsp_PROB_FILE *p); +diff -u -Nr -U5 gmsh-4.11.1-source/contrib/blossom/concorde97/TSP/tsp_lp.c gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/TSP/tsp_lp.c +--- gmsh-4.11.1-source/contrib/blossom/concorde97/TSP/tsp_lp.c 2020-09-08 20:07:54.000000000 +0200 ++++ gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/TSP/tsp_lp.c 2025-01-07 22:30:09.744193715 +0100 +@@ -216,10 +216,12 @@ + #include "tsp.h" + #include "lp.h" + #include "bigguy.h" + #include "cut.h" + ++#include ++ + /* + parameters for addbad_variables. Addbad generates edges (x,y) with + len(x,y) - pi_ub[x] - pi_ub[y] < 0 in chunks of PRICE_GEN, computes + rc for that chunk, and adds those with rc(x,y) < CCtsp_PRICE_RCTHRESH to the + pool. This continues until the pool contains more than PRICE_POOL edges, +diff -u -Nr -U5 gmsh-4.11.1-source/contrib/blossom/concorde97/UTIL/getdata.c gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/UTIL/getdata.c +--- gmsh-4.11.1-source/contrib/blossom/concorde97/UTIL/getdata.c 2020-09-08 20:07:54.000000000 +0200 ++++ gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/UTIL/getdata.c 2025-01-08 00:44:09.557293179 +0100 +@@ -160,10 +160,12 @@ + /***************************************************************************/ + + #include "machdefs.h" + #include "util.h" + ++#include ++ + #define MATRAND_SCALE 10 /* Range of edge lengths: [0, MATRAND_SCALE * n) */ + + #ifdef CC_PROTOTYPE_ANSI + + static void +diff -u -Nr -U5 gmsh-4.11.1-source/contrib/blossom/concorde97/UTIL/safe_io.c gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/UTIL/safe_io.c +--- gmsh-4.11.1-source/contrib/blossom/concorde97/UTIL/safe_io.c 2020-09-08 20:07:54.000000000 +0200 ++++ gmsh-4.11.1-source.string-includes/contrib/blossom/concorde97/UTIL/safe_io.c 2025-01-08 00:45:00.080356133 +0100 +@@ -55,10 +55,14 @@ + /***************************************************************************/ + + #include "machdefs.h" + #include "util.h" + ++#include ++#include ++#include ++ + #ifndef SEEK_SET + #ifdef L_SET + #define SEEK_SET L_SET + #else + #define SEEK_SET 0 -- GitLab