[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/

[Anthony G. Basile]

commit:     efd4e81c082cd6a97b2c85fa82a8cfe72adfa904
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 18:36:07 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 18:36:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd4e81c

dev-libs/libsodium: add support on musl

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-libs/libsodium/libsodium-1.0.15-r1.ebuild | 4 +++-
 dev-libs/libsodium/libsodium-1.0.16-r2.ebuild | 6 +++++-
 dev-libs/libsodium/libsodium-1.0.17.ebuild    | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild 
b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
index cbf53540a9c..ae0419e4c36 100644
--- a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,8 @@ src_configure() {
 
        # --disable-pie needed on x86, bug #512734
        use x86 && myconf="${myconf} --disable-pie"
+       # --disable-ssp is needed on musl x86
+       use x86 && use elibc_musl && myconf+="${myconf} --disable-ssp"
 
        econf \
                $(use_enable asm) \

diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild 
b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index 393a0f21ab8..fe657340775 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,10 @@ multilib_src_configure() {
        # --disable-pie is needed on x86, see bug #512734
        if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
                myconf="${myconf} --disable-pie"
+               # --disable-ssp is needed on musl x86
+               if use elibc_musl; then
+                       myconf+="${myconf} --disable-ssp"
+               fi
        fi
 
        econf \

diff --git a/dev-libs/libsodium/libsodium-1.0.17.ebuild 
b/dev-libs/libsodium/libsodium-1.0.17.ebuild
index dcfe073f575..ca8df8c8f25 100644
--- a/dev-libs/libsodium/libsodium-1.0.17.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.17.ebuild
@@ -34,6 +34,10 @@ multilib_src_configure() {
        # --disable-pie is needed on x86, see bug #512734
        if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
                myeconfargs+=( --disable-pie )
+               # --disable-ssp is needed on musl x86
+               if use elibc_musl; then
+                       myeconfargs+=( --disable-ssp )
+               fi
        fi
 
        ECONF_SOURCE="${S}" econf ${myeconfargs[@]}