Merge pull request #49 from jdblischak/move-capnproto-to-build

conda-forge · Oct 7, 2024 · 58147b8 · 58147b8
2 parents d0fb57a + ccfc6ce
commit 58147b8
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 26 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,21 +1,21 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 openssl:
@@ -28,4 +28,4 @@ zip_keys:
 - - c_stdlib_version
   - cdt_name
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openssl:
@@ -28,4 +28,4 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 macos_machine:
 - arm64-apple-darwin20.0.0
 openssl:
@@ -28,4 +28,4 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -13,4 +13,4 @@ openssl:
 target_platform:
 - win-64
 zlib:
-- '1.2'
+- '1'
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.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/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -14,14 +14,9 @@ HOST_ARCH=${CONDA_TOOLCHAIN_HOST%%-*}
 
 configure_cmd=(./configure --enable-shared --prefix=$PREFIX)
 
-# cross-compiling needs to use prebuilt capnp
+# cross-compiling needs to use prebuilt capnproto
 # https://github.com/capnproto/capnproto/issues/1815#issuecomment-1732327995
-# We should install this using meta.yaml, but currently capnproto requires
-# openSSL 1.1, which conflicts with some other dependencies, so we have to
-# install it here with --no-deps.
-# TODO: remove this when capnproto is updated to use openSSL 3.
 if [[ "${BUILD_ARCH}" != "${HOST_ARCH}" ]]; then
-    mamba install --no-deps --yes capnproto
     configure_cmd+=("--with-external-capnp")
 fi
 

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -12,7 +12,7 @@ source:
     - fix-msvc.diff
 
 build:
-  number: 1
+  number: 2
   run_exports:
     # soname changes with every release
     # https://abi-laboratory.pro/index.php?view=timeline&l=capnproto
@@ -30,6 +30,9 @@ requirements:
     - automake   # [unix]
     - libtool    # [unix]
     - binutils    # [unix]
+    # cross-compiling needs to use prebuilt capnproto
+    # https://github.com/capnproto/capnproto/issues/1815#issuecomment-1732327995
+    - capnproto  # [build_platform != target_platform]
   host:
     - zlib
     - openssl
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ openssl: @@
     target_platform:
     - win-64
     zlib:
-    - '1.2'
+    - '1'