diff --git a/recipe/build_base.sh b/recipe/build_base.sh index c456da1e..c6bc4c91 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -164,8 +164,8 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then echo "ac_cv_file__dev_ptc=yes" >> config.site echo "ac_cv_pthread=yes" >> config.site echo "ac_cv_little_endian_double=yes" >> config.site + echo "ac_cv_aligned_required=no" >> config.site if [[ ${target_platform} == osx-arm64 ]]; then - echo "ac_cv_aligned_required=no" >> config.site echo "ac_cv_file__dev_ptc=no" >> config.site echo "ac_cv_pthread_is_default=yes" >> config.site echo "ac_cv_working_tzset=yes" >> config.site diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0c46396d..1abdc2f6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 1 %} +{% set build_number = 2 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} diff --git a/recipe/run_test.py b/recipe/run_test.py index f5d7f7cf..8f12f026 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -100,3 +100,6 @@ print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION) CONDA_OPENSSL_VERSION = os.getenv("openssl") assert CONDA_OPENSSL_VERSION in ssl.OPENSSL_VERSION + +# See https://github.com/conda-forge/python-feedstock/issues/718 for context: +assert sys.hash_info.algorithm.startswith("siphash")