Skip to content

Commit a992954

Browse files
(#14066) OpenSSL 1.x.x Conan 2.0 compatibility
* OpenSSL 1.x.x Conan 2.0 compatibility * Removed legacy code * Fix lint issues * Fix pedantic lint issue * Work around linter limitations * Require Conan 1.53 * nmake doesn't like -j1 * 1.53 is not enough to rely on settings_build * Remove legacy code to try to molify github-actions bot * Fix lint warning in test recipe * Moved 'r' prefix to correct location * conandata.yml schema now requires patch_description and patch_type * Use 'if' rather than 'elif' per linter * Use f-strings per lint * Put back legacy support * Don't require msys2 when using nmake * Fixes for review comments * Apply suggestions from code review Co-authored-by: Chris Mc <[email protected]> * Use self.settings in validate() Co-authored-by: Chris Mc <[email protected]> * Removed use of shutil.which as override mechanism Co-authored-by: Chris Mc <[email protected]> * Use explicit calls to nmake; removed Conan-version-specific code * Revise comment regra Co-authored-by: Chris Mc <[email protected]> * Removed unused shutil import Co-authored-by: Chris Mc <[email protected]> Co-authored-by: Chris Mc <[email protected]>
1 parent 059b218 commit a992954

File tree

4 files changed

+227
-220
lines changed

4 files changed

+227
-220
lines changed

recipes/openssl/1.x.x/conandata.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ sources:
2727
patches:
2828
1.0.2u:
2929
- patch_file: patches/1.0.2u-darwin-arm64.patch
30-
base_path: source_subfolder
30+
patch_description: "Darwin ARM64 support"
31+
patch_type: "portability"
3132
1.1.1p:
3233
- patch_file: patches/1.1.1-tvos-watchos.patch
33-
base_path: source_subfolder
34+
patch_description: "TVOS and WatchOS don't like fork()"
35+
patch_type: "portability"
3436
1.1.1q:
3537
- patch_file: patches/1.1.1-tvos-watchos.patch
36-
base_path: source_subfolder
38+
patch_description: "TVOS and WatchOS don't like fork()"
39+
patch_type: "portability"
3740
1.1.1s:
3841
- patch_file: patches/1.1.1-tvos-watchos.patch
39-
base_path: source_subfolder
42+
patch_description: "TVOS and WatchOS don't like fork()"
43+
patch_type: "portability"

0 commit comments

Comments
 (0)