Merge pull request #33 from isuruf/system_version

CMAKE_SYSTEM_VERSION
conda-forge · Sep 3, 2020 · 8544521 · 8544521
2 parents 35d356a + 94787d1
commit 8544521
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 27 deletions.
diff --git a/...s_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64.yaml b/...s_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64.yaml
@@ -12,16 +12,15 @@ docker_image:
 - condaforge/linux-anvil-comp7
 macos_machine:
 - x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
 target_platform:
 - linux-64
+uname_kernel_release:
+- 13.4.0
 uname_machine:
 - x86_64
 zip_keys:
 - - cross_target_platform
   - macos_machine
   - uname_machine
-  - MACOSX_DEPLOYMENT_TARGET
-  - macos_min_version
+  - uname_kernel_release
   - FINAL_PYTHON_SYSCONFIGDATA_NAME
diff --git a/...target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64.yaml b/...target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64.yaml
@@ -1,7 +1,7 @@
 FINAL_PYTHON_SYSCONFIGDATA_NAME:
 - _sysconfigdata_arm64_apple_darwin20_0_0
 MACOSX_DEPLOYMENT_TARGET:
-- '11.0'
+- '10.9'
 channel_sources:
 - conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
@@ -12,16 +12,15 @@ docker_image:
 - condaforge/linux-anvil-comp7
 macos_machine:
 - arm64-apple-darwin20.0.0
-macos_min_version:
-- '11.0'
 target_platform:
 - linux-64
+uname_kernel_release:
+- 20.0.0
 uname_machine:
 - arm64
 zip_keys:
 - - cross_target_platform
   - macos_machine
   - uname_machine
-  - MACOSX_DEPLOYMENT_TARGET
-  - macos_min_version
+  - uname_kernel_release
   - FINAL_PYTHON_SYSCONFIGDATA_NAME
diff --git a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0.yaml
@@ -14,12 +14,13 @@ macos_min_version:
 - '10.9'
 target_platform:
 - osx-64
+uname_kernel_release:
+- 13.4.0
 uname_machine:
 - x86_64
 zip_keys:
 - - cross_target_platform
   - macos_machine
   - uname_machine
-  - MACOSX_DEPLOYMENT_TARGET
-  - macos_min_version
+  - uname_kernel_release
   - FINAL_PYTHON_SYSCONFIGDATA_NAME
diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0.yaml
@@ -1,7 +1,7 @@
 FINAL_PYTHON_SYSCONFIGDATA_NAME:
 - _sysconfigdata_arm64_apple_darwin20_0_0
 MACOSX_DEPLOYMENT_TARGET:
-- '11.0'
+- '10.9'
 channel_sources:
 - conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
@@ -11,15 +11,16 @@ cross_target_platform:
 macos_machine:
 - arm64-apple-darwin20.0.0
 macos_min_version:
-- '11.0'
+- '10.9'
 target_platform:
 - osx-64
+uname_kernel_release:
+- 20.0.0
 uname_machine:
 - arm64
 zip_keys:
 - - cross_target_platform
   - macos_machine
   - uname_machine
-  - MACOSX_DEPLOYMENT_TARGET
-  - macos_min_version
+  - uname_kernel_release
   - FINAL_PYTHON_SYSCONFIGDATA_NAME
diff --git a/recipe/activate-clang.sh b/recipe/activate-clang.sh
@@ -97,6 +97,10 @@ else
   CMAKE_PREFIX_PATH_USED="${CMAKE_PREFIX_PATH}:${CONDA_PREFIX}"
 fi
 
+if [ "${MACOSX_DEPLOYMENT_TARGET:-0}" != "0" ]; then
+  CPPFLAGS_USED="$CPPFLAGS_USED -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+fi
+
 if [ "${CONDA_BUILD:-0}" = "1" ]; then
   if [ -f /tmp/old-env-$$.txt ]; then
     rm -f /tmp/old-env-$$.txt || true
@@ -129,7 +133,7 @@ if [ "${CONDA_BUILD:-0}" = "1" ]; then
 fi
 
 if [ "@CONDA_BUILD_CROSS_COMPILATION@" = "1" ]; then
-  _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=@UNAME_MACHINE@"
+  _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=@UNAME_MACHINE@ -DCMAKE_SYSTEM_VERSION=@UNAME_KERNEL_RELEASE@"
 fi
 
 _tc_activation \

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -2,7 +2,7 @@
 
 CHOST=${macos_machine}
 
-FINAL_CPPFLAGS="-D_FORTIFY_SOURCE=2 -mmacosx-version-min=${macos_min_version}"
+FINAL_CPPFLAGS="-D_FORTIFY_SOURCE=2"
 FINAL_CFLAGS="-ftree-vectorize -fPIC -fPIE -fstack-protector-strong -O2 -pipe"
 FINAL_CXXFLAGS="-ftree-vectorize -fPIC -fPIE -fstack-protector-strong -O2 -pipe -stdlib=libc++ -fvisibility-inlines-hidden -std=c++14 -fmessage-length=0"
 if [[ "${uname_machine}" == "x86_64" ]]; then
@@ -47,4 +47,5 @@ find . -name "*activate*.sh" -exec sed -i.bak "s|@LDFLAGS_LD@|${FINAL_LDFLAGS_LD
 find . -name "*activate*.sh" -exec sed -i.bak "s|@CONDA_BUILD_CROSS_COMPILATION@|${CONDA_BUILD_CROSS_COMPILATION}|g"         "{}" \;
 find . -name "*activate*.sh" -exec sed -i.bak "s|@_PYTHON_SYSCONFIGDATA_NAME@|${FINAL_PYTHON_SYSCONFIGDATA_NAME}|g"  "{}" \;
 find . -name "*activate*.sh" -exec sed -i.bak "s|@UNAME_MACHINE@|${uname_machine}|g"         "{}" \;
+find . -name "*activate*.sh" -exec sed -i.bak "s|@UNAME_KERNEL_RELEASE@|${uname_kernel_release}|g"         "{}" \;
 find . -name "*activate*.sh.bak" -exec rm "{}" \;
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -7,21 +7,19 @@ macos_machine:
 uname_machine:
   - x86_64
   - arm64
-MACOSX_DEPLOYMENT_TARGET:
-  - 10.9
-  - 11.0
-macos_min_version:
-  - 10.9
-  - 11.0
+uname_kernel_release:
+  - 13.4.0
+  - 20.0.0
+MACOSX_DEPLOYMENT_TARGET:  # [linux]
+  - 10.9                   # [linux]
 FINAL_PYTHON_SYSCONFIGDATA_NAME:
   - _sysconfigdata_x86_64_apple_darwin13_4_0
   - _sysconfigdata_arm64_apple_darwin20_0_0
 zip_keys:
   - - cross_target_platform
     - macos_machine
     - uname_machine
-    - MACOSX_DEPLOYMENT_TARGET
-    - macos_min_version
+    - uname_kernel_release
     - FINAL_PYTHON_SYSCONFIGDATA_NAME
 
 channel_sources:

diff --git a/recipe/deactivate-clang.sh b/recipe/deactivate-clang.sh
@@ -97,6 +97,10 @@ else
   CMAKE_PREFIX_PATH_USED="${CMAKE_PREFIX_PATH}:${CONDA_PREFIX}"
 fi
 
+if [ "${MACOSX_DEPLOYMENT_TARGET:-0}" != "0" ]; then
+  CPPFLAGS_USED="$CPPFLAGS_USED -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+fi
+
 if [ "${CONDA_BUILD:-0}" = "1" ]; then
   if [ -f /tmp/old-env-$$.txt ]; then
     rm -f /tmp/old-env-$$.txt || true

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -11,7 +11,7 @@ source:
 
 build:
   skip: true  # [win]
-  number: 6
+  number: 7
 
 requirements:
   build:
@@ -56,7 +56,8 @@ outputs:
         - libcxx >={{ version }}
     test:
       commands:
-        - echo {{ MACOSX_DEPLOYMENT_TARGET }}
+        - echo {{ MACOSX_DEPLOYMENT_TARGET }}  # [linux]
+        - echo {{ uname_kernel_release }}
         - echo {{ uname_machine }}
         - echo {{ FINAL_PYTHON_SYSCONFIGDATA_NAME }}
         - {{ macos_machine }}-clang++ --version