#29 relax xsd xerces dependency

Chaste · Apr 16, 2024 · e41d0bd · e41d0bd
1 parent 105e3ff
commit e41d0bd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/infra/conda/xsd/4.0/recipe/build.sh b/infra/conda/xsd/4.0/recipe/build.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
 
+# https://github.com/Homebrew/homebrew-core/blob/3e856f62bfab2ff25405eaa9a40b4bad61bd4a54/Formula/x/xsd.rb
+mv xsd/version xsd/version.txt
+mv libxsd-frontend/version libxsd-frontend/version.txt
+mv libcutl/version libcutl/version.txt
+
 make \
   CC="$CC" \
   CXX="$CXX" \
   AR="$AR" \
   RANLIB="$RANLIB" \
   CFLAGS="$CFLAGS" \
   CPPFLAGS="$CPPFLAGS" \
-  CXXFLAGS="$CXXFLAGS \
-  -std=c++14" \
+  CXXFLAGS="$CXXFLAGS -std=c++14" \
   LDFLAGS="$LDFLAGS" \
   -j $CPU_COUNT \
   verbose=1

diff --git a/infra/conda/xsd/4.0/variants/linux_64.yaml b/infra/conda/xsd/4.0/variants/linux_64.yaml
@@ -15,14 +15,10 @@ cxx_compiler_version:
   - "9"
 docker_image:
   - quay.io/condaforge/linux-anvil-cos7-x86_64
-pin_run_as_build:
-  xercesc:
-    min_pin: x
-    max_pin: x
 target_platform:
   - linux-64
 xercesc:
-  - "3"
+  - ">=3,<4"
 zip_keys:
   - - c_compiler_version
     - cxx_compiler_version
diff --git a/infra/conda/xsd/4.0/variants/osx_64.yaml b/infra/conda/xsd/4.0/variants/osx_64.yaml
@@ -17,14 +17,10 @@ cxx_compiler_version:
   - "16"
 macos_machine:
   - x86_64-apple-darwin13.4.0
-pin_run_as_build:
-  xercesc:
-    min_pin: x
-    max_pin: x
 target_platform:
   - osx-64
 xercesc:
-  - "3"
+  - ">=3,<4"
 zip_keys:
   - - c_compiler_version
     - cxx_compiler_version
diff --git a/infra/conda/xsd/4.0/variants/osx_arm64.yaml b/infra/conda/xsd/4.0/variants/osx_arm64.yaml
@@ -17,14 +17,10 @@ cxx_compiler_version:
   - "16"
 macos_machine:
   - arm64-apple-darwin20.0.0
-pin_run_as_build:
-  xercesc:
-    min_pin: x
-    max_pin: x
 target_platform:
   - osx-arm64
 xercesc:
-  - "3"
+  - ">=3,<4"
 zip_keys:
   - - c_compiler_version
     - cxx_compiler_version