Merge pull request #32 from h-vetinari/openssl3

Rebuild for openssl3
conda-forge · May 23, 2024 · d0fb57a · d0fb57a
2 parents dda356e + f9fa7a8
commit d0fb57a
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 29 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -14,10 +18,14 @@ cxx_compiler_version:
 - '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+openssl:
+- '3'
 target_platform:
 - linux-64
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,11 +1,15 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.12'
+- '10.13'
 MACOSX_SDK_VERSION:
-- '10.12'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -16,6 +20,8 @@ cxx_compiler_version:
 - '16'
 macos_machine:
 - x86_64-apple-darwin13.4.0
+openssl:
+- '3'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,9 +1,15 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -14,6 +20,8 @@ cxx_compiler_version:
 - '16'
 macos_machine:
 - arm64-apple-darwin20.0.0
+openssl:
+- '3'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,11 +1,15 @@
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - vs2019
+openssl:
+- '3'
 target_platform:
 - win-64
 zlib:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
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/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -13,9 +13,8 @@ if errorlevel 1 exit 1
 cmake --build . --config Release
 if errorlevel 1 exit 1
 
-@REM Some of the tests fail in part 2 of the tests (SegFault when build type is Release, unexpected value in one test when build typ is Debug)
-@REM cmake --build . --target check --config Release
-@REM if errorlevel 1 exit 1
+cmake --build . --target check --config Release
+if errorlevel 1 exit 1
 
 cmake --build . --target INSTALL --config Release
 if errorlevel 1 exit 1
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
diff --git a/recipe/fix-msvc.diff b/recipe/fix-msvc.diff
@@ -0,0 +1,13 @@
+--- c++/src/kj/CMakeLists.txt.bak   2024-05-20 14:48:26.618071654 -0500
++++ c++/src/kj/CMakeLists.txt       2024-05-20 14:53:15.106427359 -0500
+@@ -139,6 +139,9 @@
+ )
+ if(NOT CAPNP_LITE)
+   add_library(kj-async ${kj-async_sources})
++  if (MSVC)
++    set_property(SOURCE async.c++ APPEND PROPERTY COMPILE_OPTIONS "/O1")
++  endif()
+   add_library(CapnProto::kj-async ALIAS kj-async)
+   target_link_libraries(kj-async PUBLIC kj)
+   if(WITH_FIBERS)
+
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -5,9 +5,11 @@ package:
   version: {{ version }}
 
 source:
-  fn: v{{ version }}.tar.gz
   url: https://github.com/capnproto/capnproto/archive/v{{ version }}.tar.gz
   md5: 4dd1aaacff63781087e89097f9b02542
+  patches:
+    # MSVC miscompiles async.c++ file when /O2 is given
+    - fix-msvc.diff
 
 build:
   number: 1
@@ -24,14 +26,13 @@ requirements:
     - make  # [not win]
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
+    - {{ stdlib('c') }}
     - automake   # [unix]
     - libtool    # [unix]
     - binutils    # [unix]
   host:
     - zlib
-    - openssl 1.1*
-  run:
-    - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx]
+    - openssl
 
 test:
   source_files:
@@ -67,6 +68,7 @@ about:
 
 extra:
   recipe-maintainers:
+    - isuruf
     - LehMaxence
     - ihnorton
     - Shelnutt2