| 1 |
commit: efd4e81c082cd6a97b2c85fa82a8cfe72adfa904 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 19 18:36:07 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 19 18:36:07 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd4e81c |
| 7 |
|
| 8 |
dev-libs/libsodium: add support on musl |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-libs/libsodium/libsodium-1.0.15-r1.ebuild | 4 +++- |
| 14 |
dev-libs/libsodium/libsodium-1.0.16-r2.ebuild | 6 +++++- |
| 15 |
dev-libs/libsodium/libsodium-1.0.17.ebuild | 4 ++++ |
| 16 |
3 files changed, 12 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild |
| 19 |
index cbf53540a9c..ae0419e4c36 100644 |
| 20 |
--- a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild |
| 21 |
+++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -26,6 +26,8 @@ src_configure() { |
| 29 |
|
| 30 |
# --disable-pie needed on x86, bug #512734 |
| 31 |
use x86 && myconf="${myconf} --disable-pie" |
| 32 |
+ # --disable-ssp is needed on musl x86 |
| 33 |
+ use x86 && use elibc_musl && myconf+="${myconf} --disable-ssp" |
| 34 |
|
| 35 |
econf \ |
| 36 |
$(use_enable asm) \ |
| 37 |
|
| 38 |
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild |
| 39 |
index 393a0f21ab8..fe657340775 100644 |
| 40 |
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild |
| 41 |
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2018 Gentoo Authors |
| 44 |
+# Copyright 1999-2019 Gentoo Authors |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI=6 |
| 48 |
@@ -28,6 +28,10 @@ multilib_src_configure() { |
| 49 |
# --disable-pie is needed on x86, see bug #512734 |
| 50 |
if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then |
| 51 |
myconf="${myconf} --disable-pie" |
| 52 |
+ # --disable-ssp is needed on musl x86 |
| 53 |
+ if use elibc_musl; then |
| 54 |
+ myconf+="${myconf} --disable-ssp" |
| 55 |
+ fi |
| 56 |
fi |
| 57 |
|
| 58 |
econf \ |
| 59 |
|
| 60 |
diff --git a/dev-libs/libsodium/libsodium-1.0.17.ebuild b/dev-libs/libsodium/libsodium-1.0.17.ebuild |
| 61 |
index dcfe073f575..ca8df8c8f25 100644 |
| 62 |
--- a/dev-libs/libsodium/libsodium-1.0.17.ebuild |
| 63 |
+++ b/dev-libs/libsodium/libsodium-1.0.17.ebuild |
| 64 |
@@ -34,6 +34,10 @@ multilib_src_configure() { |
| 65 |
# --disable-pie is needed on x86, see bug #512734 |
| 66 |
if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then |
| 67 |
myeconfargs+=( --disable-pie ) |
| 68 |
+ # --disable-ssp is needed on musl x86 |
| 69 |
+ if use elibc_musl; then |
| 70 |
+ myeconfargs+=( --disable-ssp ) |
| 71 |
+ fi |
| 72 |
fi |
| 73 |
|
| 74 |
ECONF_SOURCE="${S}" econf ${myeconfargs[@]} |
Archives