From 4b94ab7c09cc59718f3ac9b11f4d45696c10a7d0 Mon Sep 17 00:00:00 2001 From: Paul Demorest Date: Wed, 11 Dec 2024 10:57:46 -0700 Subject: [PATCH 1/5] Re-enable osx build; bump build number --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 17b440d..3782b52 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,8 +17,8 @@ source: - 0001-package-m4.patch build: - number: 0 - skip: true # [win or osx] + number: 1 + skip: true # [win] requirements: build: From 091eb209d4e1f9b72bb94c3d03d7fd17333f1510 Mon Sep 17 00:00:00 2001 From: Paul Demorest Date: Wed, 11 Dec 2024 11:06:06 -0700 Subject: [PATCH 2/5] Add libcxx-devel dependency for osx builds --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3782b52..25e5dfd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,6 +26,7 @@ requirements: - {{ compiler('c') }} - {{ stdlib("c") }} - {{ compiler('fortran') }} + - libcxx-devel # [osx] - autoconf - automake - libtool From 8fd3a35f1e4903edef0b0398de331f901556ea26 Mon Sep 17 00:00:00 2001 From: Paul Demorest Date: Wed, 11 Dec 2024 11:29:33 -0700 Subject: [PATCH 3/5] Remove libcxx-devel; change compiler version to 17 --- recipe/conda_build_config.yaml | 6 +++--- recipe/meta.yaml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index bccd5c4..2b8ecff 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,6 @@ c_compiler_version: # [osx] - - "15" # [osx] + - "17" # [osx] cxx_compiler_version: # [osx] - - "15" # [osx] + - "17" # [osx] llvm_openmp: # [osx] - - "15" # [osx] + - "17" # [osx] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 25e5dfd..3782b52 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,6 @@ requirements: - {{ compiler('c') }} - {{ stdlib("c") }} - {{ compiler('fortran') }} - - libcxx-devel # [osx] - autoconf - automake - libtool From ff791fba13e3adaabda51e28ed8019691f6086fc Mon Sep 17 00:00:00 2001 From: Paul Demorest Date: Wed, 11 Dec 2024 11:30:16 -0700 Subject: [PATCH 4/5] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.44.9, and conda-forge-pinning 2024.12.11.09.08.10 --- .ci_support/osx_64_.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 489fdaa..d18f8f8 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '15' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '17' fftw: - '3' fortran_compiler: @@ -33,7 +33,7 @@ libblas: liblapack: - 3.9 *netlib llvm_openmp: -- '15' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: From ccac5f4534b14ae3d8b4eb57f00d5b875168f43f Mon Sep 17 00:00:00 2001 From: Paul Demorest Date: Wed, 11 Dec 2024 12:36:01 -0700 Subject: [PATCH 5/5] Patch interpolate plugin --- recipe/0002-interpolate-std.patch | 12 ++++++++++++ recipe/meta.yaml | 1 + 2 files changed, 13 insertions(+) create mode 100644 recipe/0002-interpolate-std.patch diff --git a/recipe/0002-interpolate-std.patch b/recipe/0002-interpolate-std.patch new file mode 100644 index 0000000..ce64d97 --- /dev/null +++ b/recipe/0002-interpolate-std.patch @@ -0,0 +1,12 @@ +diff --git a/plugin/interpolate_plug.C b/plugin/interpolate_plug.C +index 434d476..0795eb9 100644 +--- a/plugin/interpolate_plug.C ++++ b/plugin/interpolate_plug.C +@@ -36,7 +36,6 @@ + #include "fftw3.h" + #include "choleskyRoutines.C" + +-using namespace std; + + typedef struct sample { + double x; diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3782b52..f74a601 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,7 @@ source: sha256: 4b2f4c75c137c21b9438539ef392e77edd39619024ddc4a1ddc59f6d03322a08 patches: - 0001-package-m4.patch + - 0002-interpolate-std.patch build: number: 1