| 1 |
commit: 85c9a35d3eea4416b7d234c40fa8758f721cf404 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 26 17:39:11 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 17:39:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c9a35d |
| 7 |
|
| 8 |
dev-libs/openssl: Fixed broken ldflags patch (thanks to floppym). |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/openssl/files/openssl-1.1.0-threads.patch | 20 -------------------- |
| 14 |
...e4-ldflags.patch => openssl-1.1.01-ldflags.patch} | 2 +- |
| 15 |
dev-libs/openssl/openssl-1.1.0.ebuild | 3 +-- |
| 16 |
3 files changed, 2 insertions(+), 23 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/openssl/files/openssl-1.1.0-threads.patch b/dev-libs/openssl/files/openssl-1.1.0-threads.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index d4326f6..00000000 |
| 21 |
--- a/dev-libs/openssl/files/openssl-1.1.0-threads.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,20 +0,0 @@ |
| 24 |
---- openssl-1.1.0/Configurations/10-main.conf |
| 25 |
-+++ openssl-1.1.0/Configurations/10-main.conf |
| 26 |
-@@ -612,7 +612,7 @@ |
| 27 |
- debug => "-O0 -g", |
| 28 |
- release => "-O3"), |
| 29 |
- threads("-pthread")), |
| 30 |
-- ex_libs => add("-ldl"), |
| 31 |
-+ ex_libs => add("-ldl",threads("-lpthread")), |
| 32 |
- bn_ops => "BN_LLONG RC4_CHAR", |
| 33 |
- thread_scheme => "pthreads", |
| 34 |
- dso_scheme => "dlfcn", |
| 35 |
-@@ -721,7 +721,7 @@ |
| 36 |
- inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], |
| 37 |
- cflags => add(picker(default => "-DL_ENDIAN", |
| 38 |
- release => "-fomit-frame-pointer")), |
| 39 |
-- ex_libs => add(picker(debug => "-lefence")), |
| 40 |
-+ ex_libs => add(picker(debug => "-lefence"),threads("-lpthread")), |
| 41 |
- bn_ops => "BN_LLONG", |
| 42 |
- }, |
| 43 |
- "linux-aout" => { |
| 44 |
|
| 45 |
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 |
| 46 |
similarity index 88% |
| 47 |
rename from dev-libs/openssl/files/openssl-1.1.0_pre4-ldflags.patch |
| 48 |
rename to dev-libs/openssl/files/openssl-1.1.01-ldflags.patch |
| 49 |
index f0d7e18..95a95f2 100644 |
| 50 |
--- a/dev-libs/openssl/files/openssl-1.1.0_pre4-ldflags.patch |
| 51 |
+++ b/dev-libs/openssl/files/openssl-1.1.01-ldflags.patch |
| 52 |
@@ -5,7 +5,7 @@ |
| 53 |
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ |
| 54 |
$(DO_GNU_SO_COMMON) |
| 55 |
-DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)" |
| 56 |
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) -Wl,-rpath,$(LIBRPATH)" |
| 57 |
++DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS)" |
| 58 |
|
| 59 |
#This is rather special. It's a special target with which one can link |
| 60 |
#applications without bothering with any features that have anything to |
| 61 |
|
| 62 |
diff --git a/dev-libs/openssl/openssl-1.1.0.ebuild b/dev-libs/openssl/openssl-1.1.0.ebuild |
| 63 |
index 05e1641..0aea4eb 100644 |
| 64 |
--- a/dev-libs/openssl/openssl-1.1.0.ebuild |
| 65 |
+++ b/dev-libs/openssl/openssl-1.1.0.ebuild |
| 66 |
@@ -35,9 +35,8 @@ MULTILIB_WRAPPED_HEADERS=( |
| 67 |
) |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
- "${FILESDIR}"/${PN}-1.1.0_pre4-ldflags.patch #327421 |
| 71 |
+ "${FILESDIR}"/${PN}-1.1.0-ldflags.patch #327421 |
| 72 |
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
| 73 |
- "${FILESDIR}"/${PN}-1.1.0-threads.patch |
| 74 |
) |
| 75 |
|
| 76 |
src_prepare() { |
Archives