Skip to content

Commit

Permalink
(#14066) OpenSSL 1.x.x Conan 2.0 compatibility
Browse files Browse the repository at this point in the history
* 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 <prince.chrismc@gmail.com>

* Use self.settings in validate()

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>

* Removed use of shutil.which as override mechanism

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>

* Use explicit calls to nmake; removed Conan-version-specific code

* Revise comment regra

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>

* Removed unused shutil import

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
  • Loading branch information
System-Arch and prince-chrismc authored Dec 23, 2022
1 parent 059b218 commit a992954
Show file tree
Hide file tree
Showing 4 changed files with 227 additions and 220 deletions.
12 changes: 8 additions & 4 deletions recipes/openssl/1.x.x/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,17 @@ sources:
patches:
1.0.2u:
- patch_file: patches/1.0.2u-darwin-arm64.patch
base_path: source_subfolder
patch_description: "Darwin ARM64 support"
patch_type: "portability"
1.1.1p:
- patch_file: patches/1.1.1-tvos-watchos.patch
base_path: source_subfolder
patch_description: "TVOS and WatchOS don't like fork()"
patch_type: "portability"
1.1.1q:
- patch_file: patches/1.1.1-tvos-watchos.patch
base_path: source_subfolder
patch_description: "TVOS and WatchOS don't like fork()"
patch_type: "portability"
1.1.1s:
- patch_file: patches/1.1.1-tvos-watchos.patch
base_path: source_subfolder
patch_description: "TVOS and WatchOS don't like fork()"
patch_type: "portability"
Loading

0 comments on commit a992954

Please sign in to comment.