commit: 85c9a35d3eea4416b7d234c40fa8758f721cf404 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Aug 26 17:39:11 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Aug 26 17:39:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c9a35d
dev-libs/openssl: Fixed broken ldflags patch (thanks to floppym). Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> dev-libs/openssl/files/openssl-1.1.0-threads.patch | 20 -------------------- ...e4-ldflags.patch => openssl-1.1.01-ldflags.patch} | 2 +- dev-libs/openssl/openssl-1.1.0.ebuild | 3 +-- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dev-libs/openssl/files/openssl-1.1.0-threads.patch b/dev-libs/openssl/files/openssl-1.1.0-threads.patch deleted file mode 100644 index d4326f6..00000000 --- a/dev-libs/openssl/files/openssl-1.1.0-threads.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openssl-1.1.0/Configurations/10-main.conf -+++ openssl-1.1.0/Configurations/10-main.conf -@@ -612,7 +612,7 @@ - debug => "-O0 -g", - release => "-O3"), - threads("-pthread")), -- ex_libs => add("-ldl"), -+ ex_libs => add("-ldl",threads("-lpthread")), - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", -@@ -721,7 +721,7 @@ - inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], - cflags => add(picker(default => "-DL_ENDIAN", - release => "-fomit-frame-pointer")), -- ex_libs => add(picker(debug => "-lefence")), -+ ex_libs => add(picker(debug => "-lefence"),threads("-lpthread")), - bn_ops => "BN_LLONG", - }, - "linux-aout" => { diff --git a/dev-libs/openssl/files/openssl-1.1.0_pre4-ldflags.patch b/dev-libs/openssl/files/openssl-1.1.01-ldflags.patch similarity index 88% rename from dev-libs/openssl/files/openssl-1.1.0_pre4-ldflags.patch rename to dev-libs/openssl/files/openssl-1.1.01-ldflags.patch index f0d7e18..95a95f2 100644 --- a/dev-libs/openssl/files/openssl-1.1.0_pre4-ldflags.patch +++ b/dev-libs/openssl/files/openssl-1.1.01-ldflags.patch @@ -5,7 +5,7 @@ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ $(DO_GNU_SO_COMMON) -DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(LDFLAGS) -Wl,-rpath,$(LIBRPATH)" ++DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS)" #This is rather special. It's a special target with which one can link #applications without bothering with any features that have anything to diff --git a/dev-libs/openssl/openssl-1.1.0.ebuild b/dev-libs/openssl/openssl-1.1.0.ebuild index 05e1641..0aea4eb 100644 --- a/dev-libs/openssl/openssl-1.1.0.ebuild +++ b/dev-libs/openssl/openssl-1.1.0.ebuild @@ -35,9 +35,8 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - "${FILESDIR}"/${PN}-1.1.0_pre4-ldflags.patch #327421 + "${FILESDIR}"/${PN}-1.1.0-ldflags.patch #327421 "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - "${FILESDIR}"/${PN}-1.1.0-threads.patch ) src_prepare() {