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 96B0513835C for ; Tue, 23 Mar 2021 04:53:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B601E0864; Tue, 23 Mar 2021 04:53:27 +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 3F291E0863 for ; Tue, 23 Mar 2021 04:53:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D932F33C6B6 for ; Tue, 23 Mar 2021 04:53:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CD73637 for ; Tue, 23 Mar 2021 04:53:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1616474927.3352d28301fd2c5b30afbb5726716757530832e1.sam@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.18.ebuild X-VCS-Directories: dev-libs/libsodium/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3352d28301fd2c5b30afbb5726716757530832e1 X-VCS-Branch: master Date: Tue, 23 Mar 2021 04:53:23 +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: b3b67f36-926d-41c6-90a3-89f5b3c49433 X-Archives-Hash: 744be763f9f5b4eddbbf1b4fb413d06d commit: 3352d28301fd2c5b30afbb5726716757530832e1 Author: Sam James gentoo org> AuthorDate: Mon Mar 22 22:40:46 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 23 04:48:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3352d283 dev-libs/libsodium: add comment re musl SSP, style * Add comment re musl SSP (check this is still needed, bug ref) * Style changes including quoting array variable Bug: https://bugs.gentoo.org/747346 Signed-off-by: Sam James gentoo.org> dev-libs/libsodium/libsodium-1.0.18.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild index 18163817140..220e1a8d1c6 100644 --- a/dev-libs/libsodium/libsodium-1.0.18.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,9 @@ SLOT="0/23" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes" -PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch +) src_prepare() { default @@ -32,15 +34,17 @@ multilib_src_configure() { ) # --disable-pie is needed on x86, see bug #512734 - if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then + if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then myeconfargs+=( --disable-pie ) + # --disable-ssp is needed on musl x86 - if use elibc_musl; then + # TODO: Check if still needed? bug #747346 + if use elibc_musl ; then myeconfargs+=( --disable-ssp ) fi fi - ECONF_SOURCE="${S}" econf ${myeconfargs[@]} + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install_all() {