commit: 06a2a7a940e40c6057924e633c1504fd3e0292c8 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Jul 28 17:01:23 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Jul 28 17:01:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a2a7a9
dev-libs/openssl: fix Libs.private in libcrypto.pc Closes: https://bugs.gentoo.org/936793 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../openssl/files/openssl-3.3.1-pkg-config.patch | 31 ++++++++++++++++++++++ ...penssl-3.3.1.ebuild => openssl-3.3.1-r1.ebuild} | 2 ++ 2 files changed, 33 insertions(+) diff --git a/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch b/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch new file mode 100644 index 000000000000..b915b963509a --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch @@ -0,0 +1,31 @@ +https://github.com/openssl/openssl/pull/25018 +https://bugs.gentoo.org/936793 + +From b7bd618fb12728b4a85b9159af95ca40a817674d Mon Sep 17 00:00:00 2001 +From: Richard Levitte <[email protected]> +Date: Sun, 28 Jul 2024 10:47:08 +0200 +Subject: [PATCH] fix: util/mkinstallvars.pl mistreated LDLIBS on Unix (and + Windows) + +Don't do comma separation on those platforms. + +Fixes #24986 +--- + util/mkinstallvars.pl | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl +index 5fadb708e1b77..e2b7d9d08321f 100644 +--- a/util/mkinstallvars.pl ++++ b/util/mkinstallvars.pl +@@ -124,7 +124,9 @@ package OpenSSL::safe::installdata; + our \$VERSION = '$ENV{VERSION}'; + our \@LDLIBS = + # Unix and Windows use space separation, VMS uses comma separation +- split(/ +| *, */, '$ENV{LDLIBS}'); ++ \$^O eq 'VMS' ++ ? split(/ *, */, '$ENV{LDLIBS}') ++ : split(/ +/, '$ENV{LDLIBS}'); + + 1; + _____ diff --git a/dev-libs/openssl/openssl-3.3.1.ebuild b/dev-libs/openssl/openssl-3.3.1-r1.ebuild similarity index 99% rename from dev-libs/openssl/openssl-3.3.1.ebuild rename to dev-libs/openssl/openssl-3.3.1-r1.ebuild index 18c0067df4fc..b91bebbeb911 100644 --- a/dev-libs/openssl/openssl-3.3.1.ebuild +++ b/dev-libs/openssl/openssl-3.3.1-r1.ebuild @@ -59,6 +59,8 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( # bug 936311, drop on next version bump "${FILESDIR}"/${P}-riscv.patch + # https://bugs.gentoo.org/936793 + "${FILESDIR}"/openssl-3.3.1-pkg-config.patch ) pkg_setup() {
