dev-libs/openssl: Fixed broken ldflags patch (thanks to floppym).

Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler <[email protected]>
hanetzer · Aug 26, 2016 · 85c9a35 · 85c9a35
1 parent f2b5c32
commit 85c9a35
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 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
diff --git a/...sl/files/openssl-1.1.0_pre4-ldflags.patch → ...penssl/files/openssl-1.1.01-ldflags.patch b/...sl/files/openssl-1.1.0_pre4-ldflags.patch → ...penssl/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
@@ -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() {