From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59874138334 for ; Sat, 19 Jan 2019 18:36:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BB7DE0903; Sat, 19 Jan 2019 18:36:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19F72E0903 for ; Sat, 19 Jan 2019 18:36:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9220335CF4 for ; Sat, 19 Jan 2019 18:36:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CE8F4FC for ; Sat, 19 Jan 2019 18:36:52 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1547922967.efd4e81c082cd6a97b2c85fa82a8cfe72adfa904.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libsodium/libsodium-1.0.15-r1.ebuild dev-libs/libsodium/libsodium-1.0.16-r2.ebuild dev-libs/libsodium/libsodium-1.0.17.ebuild X-VCS-Directories: dev-libs/libsodium/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: efd4e81c082cd6a97b2c85fa82a8cfe72adfa904 X-VCS-Branch: master Date: Sat, 19 Jan 2019 18:36:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa5163d2-9dc2-4776-a012-aee85ae8b94e X-Archives-Hash: 45576277e5e897969d37c300f6e24f9f commit: efd4e81c082cd6a97b2c85fa82a8cfe72adfa904 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Jan 19 18:36:07 2019 +0000 Commit: Anthony G. Basile gentoo 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 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[@]}