Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Openssl 3.x.x conan v2 #16563

Closed
wants to merge 20 commits into from
Closed

Openssl 3.x.x conan v2 #16563

wants to merge 20 commits into from

Commits on Mar 5, 2023

  1. [openssl 3.x.x] fix "official" OpenSSL vars for CMakeDeps gen 

    this extends the improvements of PR conan-io#12838 done for the 1.x.x recipe
to the 3.x.x one; also there is a new 3.x.x test_package using
the CMakeDeps generator
    @jngrb
    jngrb committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    0397aeb View commit details
    Browse the repository at this point in the history

  2. openssl 3.x.x test package: do not skip test for certain MacOS variants 

    removed the _skip_test part taken from "v2 test package" for 1.x.x
as it was not in "v1 test package" for 3.x.x
    @jngrb
    jngrb committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    22ce88b View commit details
    Browse the repository at this point in the history

  3. [openssl 3.x.x] raise ConanInvalidConfiguration for certain Macos con… 

    …figurations

reason: see comments in the validate method of the 3.x.x's conanfile.py
    @jngrb
    jngrb committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    24e21be View commit details
    Browse the repository at this point in the history

  4. Revert "[openssl 3.x.x] raise ConanInvalidConfiguration for certain M… 

    …acos configurations"

This reverts commit b4e8812.
    @jngrb
    jngrb committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    f33adef View commit details
    Browse the repository at this point in the history

  5. openssl 3.x.x test package: changes as proposed in PR conan-io#14426

    @jngrb
    jngrb committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    e33d879 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Michael Keck <[email protected]>
    @jngrb @Croydon
    jngrb and Croydon authored Mar 6, 2023
    Configuration menu
    Copy the full SHA
    f83f90e View commit details
    Browse the repository at this point in the history

  2. openssl 3.x.x (v2) test package: readded openssl version test 

    plus some cleanup
    @jngrb
    jngrb committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    4747491 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. openssl 3.x.x (v2) test package: removed superfluos existence test

    @jngrb
    jngrb committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    e1eb0c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Merge branch 'master' into openssl_3.x.x_cmakedeps_fix

    @jngrb
    jngrb committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    1fe35ae View commit details
    Browse the repository at this point in the history

  2. [openssl 3.x.x] changed recipes to be conan v2 compatible 

    also changed openssl 3.x.x test package to be compatible
with conan v1 and v2 (self.dependencies["openssl"].options
is not available in conan v1's test method)
    @jngrb
    jngrb committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    f1a433a View commit details
    Browse the repository at this point in the history

  3. fixed syntax errors and linter reportings

    @jngrb
    jngrb committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    4e23686 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into openssl_3.x.x_conan_v2

    @jngrb
    jngrb committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    a2c78a0 View commit details
    Browse the repository at this point in the history

  5. openssl 3.x.x v1 test package: check for LICENSE (not LICENSE.txt)

    @jngrb
    jngrb committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    22a0c08 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Merge remote-tracking branch 'origin/master' into openssl_3.x.x_conan_v2

    @jngrb
    jngrb committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    f604f38 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. OpenSSL 3.x.x test pkg: do not check for zlib headers with conan v2 

    reason: with conan v2, transitive include paths are no longer set
automatically so the test pkg would need to directly depend on zlib.
    @jngrb
    jngrb committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    70e3685 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. OpenSSL 3.x.x recipe: move default MSVC CFLAGS and LDFLAGS to recipe 

    Configurations/10-main.conf defines /nologo and /debug flags
as default for Visual Studio that should be set by recipe
    @jngrb
    jngrb committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    862b14d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into openssl_3.x.x_conan_v2

    @jngrb
    jngrb committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    1b6f6b6 View commit details
    Browse the repository at this point in the history

  3. OpenSSL 3.x.x recipe: use is_msvc tooling

    @jngrb
    jngrb committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    f5be79a View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. OpenSSL 3.x.x: re-enable special Apple changes; no tool test 

    * re-enable the Apple changes in _patch_install_name
* do not test the "openssl" standalone tool for Conan v2
  (because of the complexity whether this test would work
   for deviating build and host profiles)
    @jngrb
    jngrb committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    3df73a2 View commit details
    Browse the repository at this point in the history

  2. attempt to fix Apple patch of Makefile

    @jngrb
    jngrb committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    74ad4a1 View commit details
    Browse the repository at this point in the history