From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- dev-libs/libsodium/Manifest | 2 +- dev-libs/libsodium/libsodium-1.0.18.ebuild | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'dev-libs/libsodium') diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index 1c39368fd1bc..a61acb4955cb 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -1,4 +1,4 @@ AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef -EBUILD libsodium-1.0.18.ebuild 1294 BLAKE2B 5725d374a2a95123d1e33f54e5e8173875dfe9212f58a0dc5a37fe56d758e2de26085a5fa91a93147ffbd43f7ede886aa75f0c4058f6b7a3aaf63145c9b282ce SHA512 90f66f40a40b994efc7c0bca40a4d6b5238f733a0489821e1b8bbaf7f7c1fb3345f8c5479643fb09c50e8f9f7546892a090ca3bbd0a470ea3c720605aa887ae6 +EBUILD libsodium-1.0.18.ebuild 1345 BLAKE2B 20eacf865ae5a6179a986da2a38f5a7bdea2caa28157c5a6968965766e40b8e46c53bf02072c75d33beeb9c4e38d6282714e4e7d8f81c51d49c35b0578250769 SHA512 30e01ab0c8f062506f9e6c241220578804f72fd0039f8fab74bf852b9cde74db24fe7053e53da92d48fc3a1d4a2ae80451c3c347977a3ec59aa0849c072f814a MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0 diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild index 181638171400..220e1a8d1c63 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() { -- cgit v1.2.3