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

Fix handling of OpenSSL linking on macOS #17535

Merged
merged 8 commits into from
May 21, 2024
Merged

Fix handling of OpenSSL linking on macOS #17535

merged 8 commits into from
May 21, 2024

Commits on May 20, 2024

  1. Pull in all dependencies for macOS CI jobs. 

    Instead of only pulling in a basic set.
    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    b018a67 View commit details
    Browse the repository at this point in the history

  2. Switch to using imported target for OpenSSL in most cases.

    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    2a10d87 View commit details
    Browse the repository at this point in the history

  3. Use imported libraries for OpenSSL in all cases.

    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    4e680d7 View commit details
    Browse the repository at this point in the history

  4. Work around broken behavior in FindPkgConfig with static builds. 

    It happened to be working before without this because we weren’t
hitting any edge cases, but the use of IMPORTED targets with PkgConfig
requires these fixes to behave correctly for transitive dependencies in
static builds.
    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    c055bf2 View commit details
    Browse the repository at this point in the history

  5. Correctly detect static builds.

    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    8d974db View commit details
    Browse the repository at this point in the history

  6. Fix H2O linking.

    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    eda484a View commit details
    Browse the repository at this point in the history

  7. Fix typo.

    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    47edd56 View commit details
    Browse the repository at this point in the history

  8. Always check for libcrypto if we found openssl. 

    If we fail to find libcrypto when we found openssl with
pkg_check_modules, then the openssl install is horribly broken and we
will see failures either at link time or at runtime, so there is no
point in not checking for it on macOS.

This also more clearly delineates that we _do_ require libcrypto
irrespective of the platform.
    @Ferroin
    Ferroin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    392b8c1 View commit details
    Browse the repository at this point in the history