summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-02-10 10:40:38 +0000
committerSam James <sam@gentoo.org>2022-02-10 11:36:22 +0000
commit4a66e15deb7f7ec7ad747c292da3d88adf674f30 (patch)
tree1ca76cf674ec74bd427d0b8b65871432af3c7b9d /dev-libs
parentdev-libs/libgcrypt: add 1.8.9 (diff)
downloadgentoo-4a66e15deb7f7ec7ad747c292da3d88adf674f30.tar.gz
gentoo-4a66e15deb7f7ec7ad747c292da3d88adf674f30.tar.bz2
gentoo-4a66e15deb7f7ec7ad747c292da3d88adf674f30.zip
dev-libs/libgcrypt: add workaround for GCC 11 bug for ARM64
Need to revbump because of miscompilation with -O3/-ftree-vectorize on ARM64 with < GCC 11.3 (or 11.2.1_p* in Gentoo). Let's be on the safe side. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libgcrypt/Manifest1
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild (renamed from dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild)13
2 files changed, 12 insertions, 2 deletions
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 9575a0d00d28..f35a2d248215 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,3 +3,4 @@ DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e
DIST libgcrypt-1.8.9.tar.bz2 2988243 BLAKE2B d778bc3007dfcc08f3fab0325609911aa2cde5eb46703fab11f0fdfaf4670a9fde0634b40eb408957a9942e9d3fb0a69290c0878bed59770ffe56bbe6103bcf3 SHA512 6d5a06c5bded61cc740b7883a011e65fd8d878d446160714f26cd42203a32a134ccb302e7577762ae43fec4887cdb6fb4b5413e77614c9e4cfba15ae0a093516
DIST libgcrypt-1.8.9.tar.bz2.sig 119 BLAKE2B 147fd4701eb5c91c43e1ca21f56b36f8d999c5b1a23bb2f454a05e1ef657a4a96c06b27f2d5c867c8adb9764b9d6d80480a69160b2cd2ad1704c1ff18a37fac5 SHA512 785cb3b3950e6b7102d81cee3690b99b11aa60102ab4333370e60874ad8bbdb2f89ce1b5e0ce9215adce1cdc2a3fe84bb7a92a80830594aa3f74e4129d16ad95
DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
+DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
index b921a352a0e5..aed977479586 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
@@ -3,11 +3,13 @@
EAPI=7
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
HOMEPAGE="https://www.gnupg.org/"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
@@ -30,7 +32,8 @@ REQUIRED_USE="
RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
+BDEPEND="doc? ( virtual/texi2dvi )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
PATCHES=(
"${FILESDIR}"/${PN}-multilib-syspath.patch
@@ -66,6 +69,12 @@ multilib_src_configure() {
use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
fi
+ # Workaround for GCC < 11.3 bug
+ # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
+ if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)); then
+ append-flags -fno-tree-loop-vectorize
+ fi
+
local myeconfargs=(
CC_FOR_BUILD="$(tc-getBUILD_CC)"