Merge pull request #139 from djhoese/debug-ppc

Force ppc64le builds to use gcc 13
conda-forge · Oct 20, 2023 · 1f931ac · 1f931ac
2 parents e622434 + e9a4e16
commit 1f931ac
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 66 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 cdt_name:
 - cos7
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libcurl:

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 libcurl:
 - '8'
 libtiff:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 libcurl:
 - '8'
 libtiff:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -0,0 +1,4 @@
+c_compiler_version:    # [ppc64le]
+  - 13                 # [ppc64le]
+cxx_compiler_version:  # [ppc64le]
+  - 13                 # [ppc64le]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -11,7 +11,7 @@ source:
     - define_OLD_BUGGY_REMQUO.patch
 
 build:
-  number: 1
+  number: 2
   run_exports:
     # so name changes in bugfix revisions.  Pin to bugfix revision.
     #    https://abi-laboratory.pro/tracker/timeline/proj/
@@ -40,6 +40,10 @@ test:
     - test -f ${PREFIX}/lib/libproj${SHLIB_EXT}  # [unix]
     - test ! -f ${PREFIX}/lib/libproj.a          # [unix]
     - if not exist %LIBRARY_LIB%\\proj.lib exit 1  # [win]
+    # should be the first CLI test to ensure cs2cs results don't change
+    # See https://github.com/conda-forge/proj.4-feedstock/pull/139
+    - >-
+      [[ $(echo 569704.57 4269024.67 | cs2cs EPSG:26915 +to EPSG:26715) == $(echo 569704.57 4269024.67 | cs2cs EPSG:26915 +to EPSG:26715) ]]  # [unix]
     - echo -105 40 | proj +proj=utm +zone=13 +ellps=WGS84
     - echo -117 30 | cs2cs +proj=latlong +datum=NAD27 +to +proj=latlong +datum=NAD83
     - echo -105 40 | cs2cs +init=epsg:4326 +to +init=epsg:2975