diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
tree | 4d26462d027b14926335894749d2e01d982234d0 /dev-libs/libsodium/libsodium-1.0.18.ebuild | |
parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) |
gentoo resync : 27.03.2021
Diffstat (limited to 'dev-libs/libsodium/libsodium-1.0.18.ebuild')
-rw-r--r-- | dev-libs/libsodium/libsodium-1.0.18.ebuild | 14 |
1 files 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 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() { |