commit: 74578f0ade346915d1586d0a3dbe2a8aa5a383c6 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Oct 5 04:15:36 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Oct 5 04:15:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74578f0a
dev-libs/libsodium: fix AES-NI support Closes: https://bugs.gentoo.org/637070 Package-Manager: Portage-2.3.50, Repoman-2.3.11 RepoMan-Options: --force Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> dev-libs/libsodium/Manifest | 1 - .../files/libsodium-1.0.10-cpuflags.patch | 2 +- ...um-1.0.11.ebuild => libsodium-1.0.11-r1.ebuild} | 2 +- dev-libs/libsodium/libsodium-1.0.13.ebuild | 43 ---------------------- ...um-1.0.14.ebuild => libsodium-1.0.14-r1.ebuild} | 2 +- ...um-1.0.15.ebuild => libsodium-1.0.15-r1.ebuild} | 2 +- ...1.0.16-r1.ebuild => libsodium-1.0.16-r2.ebuild} | 2 +- dev-libs/libsodium/libsodium-1.0.16.ebuild | 43 ---------------------- 8 files changed, 5 insertions(+), 92 deletions(-) diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index 6afe1b80fb4..fb94526e0e5 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -1,5 +1,4 @@ DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7 -DIST libsodium-1.0.13.tar.gz 1895139 BLAKE2B cc59f58f0bcd3c7d69a32a401063f8514289a3bf655ccea303f37ec9c08ad16c8780981999f99efe8257180ef45d86af8f512271eb4e1232eefe6e5baaf300b2 SHA512 c619b12fdf0b2e59174b6e383a62d5499ebcd720fdbb2c1a41a98a46c285df075202423454b294fefee185432441e943805397d7656f7cd7837de425da623929 DIST libsodium-1.0.14.tar.gz 1876526 BLAKE2B 37e9b785cc397f58ab07e38eef9e6f3ed8a2dbfbfd1c865b64d8d9b9440db3f8aa32671065cebf4f73d449889e7abfacf63910add08f0e27582cd6fb32bfbacd SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch index 09e5c01618c..544c283d850 100644 --- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch +++ b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch @@ -24,7 +24,7 @@ CFLAGS="$oldcflags" +AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)], -+ AS_IF([test "x$enableval" = "xyes"], check_aeni="yes", check_aesni="no"), ++ AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"), + check_aesni="yes") +AS_IF([test "$check_aesni" = "yes"],[ oldcflags="$CFLAGS" diff --git a/dev-libs/libsodium/libsodium-1.0.11.ebuild b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild similarity index 96% rename from dev-libs/libsodium/libsodium-1.0.11.ebuild rename to dev-libs/libsodium/libsodium-1.0.11-r1.ebuild index 0ee03ff8535..fe9bd6598f3 100644 --- a/dev-libs/libsodium/libsodium-1.0.11.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-libs/libsodium/libsodium-1.0.13.ebuild b/dev-libs/libsodium/libsodium-1.0.13.ebuild deleted file mode 100644 index 2b80cec2ea2..00000000000 --- a/dev-libs/libsodium/libsodium-1.0.13.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils autotools - -DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://github.com/jedisct1/libsodium"; -SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/18" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf - - # --disable-pie needed on x86, bug #512734 - use x86 && myconf="${myconf} --disable-pie" - - econf \ - $(use_enable asm) \ - $(use_enable minimal) \ - $(use_enable !urandom blocking-random) \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_sse4_1 sse4_1) \ - $(use_enable cpu_flags_x86_aes aesni) \ - ${myconf} -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/libsodium/libsodium-1.0.14.ebuild b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild similarity index 96% rename from dev-libs/libsodium/libsodium-1.0.14.ebuild rename to dev-libs/libsodium/libsodium-1.0.14-r1.ebuild index 2b80cec2ea2..6d9c86e10fa 100644 --- a/dev-libs/libsodium/libsodium-1.0.14.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild similarity index 96% rename from dev-libs/libsodium/libsodium-1.0.15.ebuild rename to dev-libs/libsodium/libsodium-1.0.15-r1.ebuild index cfce5ad6f4c..cbf53540a9c 100644 --- a/dev-libs/libsodium/libsodium-1.0.15.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild similarity index 96% rename from dev-libs/libsodium/libsodium-1.0.16-r1.ebuild rename to dev-libs/libsodium/libsodium-1.0.16-r2.ebuild index dd260ff32ea..c52a78d1555 100644 --- a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-libs/libsodium/libsodium-1.0.16.ebuild b/dev-libs/libsodium/libsodium-1.0.16.ebuild deleted file mode 100644 index 6144b166e52..00000000000 --- a/dev-libs/libsodium/libsodium-1.0.16.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils autotools - -DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://github.com/jedisct1/libsodium"; -SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/23" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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 ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf - - # --disable-pie needed on x86, bug #512734 - use x86 && myconf="${myconf} --disable-pie" - - econf \ - $(use_enable asm) \ - $(use_enable minimal) \ - $(use_enable !urandom blocking-random) \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_sse4_1 sse4_1) \ - $(use_enable cpu_flags_x86_aes aesni) \ - ${myconf} -} - -src_install() { - default - prune_libtool_files -}
