Rebuild with more OSX flags for osx-arm64 (M1)

.ci_support/linux_64_.yaml

@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 numpy:

.ci_support/linux_aarch64_.yaml

@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
 numpy:

.ci_support/linux_ppc64le_.yaml

@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos7
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
 numpy:

recipe/build_zfp.sh

@@ -1,9 +1,16 @@
 #!/usr/bin/env bash
 set -e
+OSX_ARCHITECTURES=""
+if [[ "${target_platform}" == "osx-arm64" ]]; then
+  OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64"
+elif [[ "${target_platform}" == "osx-64" ]]; then
+  OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64"
+fi
 
 mkdir build
 cd build
 cmake ${CMAKE_ARGS}                \
+  ${OSX_ARCHITECTURES}             \
   -DBUILD_CFP=ON                   \
   -DBUILD_UTILITIES=ON             \
   -DZFP_WITH_OPENMP=ON             \

recipe/build_zfpy.sh

@@ -7,20 +7,23 @@ set -ex
 #  but since the build is identical, conda will not find the newly compiled
 #  libraries, and just keep using the old ons
 
-# patch for cross-builds from @erykoff
-if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
-  # workaround until cross-python is fixed
-  rm $BUILD_PREFIX/bin/python
-  ln -sf $PREFIX/bin/python $BUILD_PREFIX/bin/python
-  rm $BUILD_PREFIX/bin/cython
-  ln -sf $PREFIX/bin/cython $BUILD_PREFIX/bin/cython
+EXTRA_ARGS=
+if [[ "${target_platform}" == "osx-arm64" ]]; then
+  EXTRA_ARGS="${EXTRA_ARGS} -DCMAKE_OSX_ARCHITECTURES=arm64"
+elif [[ "${target_platform}" == "osx-64" ]]; then
+  EXTRA_ARGS="${EXTRA_ARGS} -DCMAKE_OSX_ARCHITECTURES=x86_64"
 fi
 
+
+if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
+  EXTRA_ARGS="${EXTRA_ARGS} -DCYTHON_EXECUTABLE=${BUILD_PREFIX}/bin/cython"
+fi
 rm -rf build
 mkdir build
 cd build
 
 cmake ${CMAKE_ARGS}                \
+  ${EXTRA_ARGS}             \
   -DBUILD_CFP=ON                   \
   -DBUILD_UTILITIES=ON             \
   -DBUILD_ZFPY=ON                  \
@@ -35,4 +38,3 @@ cmake ${CMAKE_ARGS}                \
 
 make -j${CPU_COUNT}
 make install
-

recipe/meta.yaml

@@ -19,7 +19,7 @@ source:
     - 100-update-cmake.patch
 
 build:
-  number: 3
+  number: 4
   script: source ${RECIPE_DIR}/build_zfp.sh  # [unix]
   script: {{ RECIPE_DIR }}\bld_zfp.bat  # [win]
   run_exports: