[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgcrypt/files/, dev-libs/libgcrypt/

["Sam James" <sam@gentoo.org>]

commit:     c83f55a74056999bbced2e91f4664172b63f9a2c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 03:52:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 03:52:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83f55a7

dev-libs/libgcrypt: fix configure w/ clang 16

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libgcrypt-1.10.1-configure-clang16.patch | 134 +++++++++++++++++
 dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild      | 164 +++++++++++++++++++++
 2 files changed, 298 insertions(+)

diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.1-configure-clang16.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-configure-clang16.patch
new file mode 100644
index 000000000000..fa80c999a3aa
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-configure-clang16.patch
@@ -0,0 +1,134 @@
+https://lists.gnupg.org/pipermail/gcrypt-devel/2022-December/005410.html
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1211,7 +1211,8 @@ AC_CACHE_CHECK([whether GCC assembler is compatible for ARM assembly implementat
+                 /* Test if '.type' and '.size' are supported.  */
+                 ".size asmfunc,.-asmfunc;\n\t"
+                 ".type asmfunc,%function;\n\t"
+-              );]], [ asmfunc(); ] )],
++              );
++	      void asmfunc(void);]], [ asmfunc(); ] )],
+             [gcry_cv_gcc_arm_platform_as_ok=yes])
+         fi])
+ if test "$gcry_cv_gcc_arm_platform_as_ok" = "yes" ; then
+@@ -1238,7 +1239,8 @@ AC_CACHE_CHECK([whether GCC assembler is compatible for ARMv8/Aarch64 assembly i
+                 "eor x0, x0, x30, ror #12;\n\t"
+                 "add x0, x0, x30, asr #12;\n\t"
+                 "eor v0.16b, v0.16b, v31.16b;\n\t"
+-              );]], [ asmfunc(); ] )],
++              );
++	      void asmfunc(void);]], [ asmfunc(); ] )],
+             [gcry_cv_gcc_aarch64_platform_as_ok=yes])
+         fi])
+ if test "$gcry_cv_gcc_aarch64_platform_as_ok" = "yes" ; then
+@@ -1267,7 +1269,8 @@ AC_CACHE_CHECK([whether GCC assembler supports for CFI directives],
+                 ".cfi_restore_state\n\t"
+                 ".long 0\n\t"
+                 ".cfi_endproc\n\t"
+-            );]])],
++            );
++	    void asmfunc(void)]])],
+           [gcry_cv_gcc_asm_cfi_directives=yes])])
+ if test "$gcry_cv_gcc_asm_cfi_directives" = "yes" ; then
+    AC_DEFINE(HAVE_GCC_ASM_CFI_DIRECTIVES,1,
+@@ -1666,7 +1669,8 @@ if test $amd64_as_feature_detection = yes; then
+        [gcry_cv_gcc_as_const_division_ok],
+        [gcry_cv_gcc_as_const_division_ok=no
+         AC_LINK_IFELSE([AC_LANG_PROGRAM(
+-          [[__asm__(".text\n\tfn:\n\t xorl \$(123456789/12345678), %ebp;\n\t");]],
++          [[__asm__(".text\n\tfn:\n\t xorl \$(123456789/12345678), %ebp;\n\t");
++	    void fn(void);]],
+             [fn();])],
+           [gcry_cv_gcc_as_const_division_ok=yes])])
+   if test "$gcry_cv_gcc_as_const_division_ok" = "no" ; then
+@@ -1679,7 +1683,8 @@ if test $amd64_as_feature_detection = yes; then
+          [gcry_cv_gcc_as_const_division_with_wadivide_ok],
+          [gcry_cv_gcc_as_const_division_with_wadivide_ok=no
+           AC_LINK_IFELSE([AC_LANG_PROGRAM(
+-            [[__asm__(".text\n\tfn:\n\t xorl \$(123456789/12345678), %ebp;\n\t");]],
++            [[__asm__(".text\n\tfn:\n\t xorl \$(123456789/12345678), %ebp;\n\t");
++	      void fn(void);]],
+               [fn();])],
+             [gcry_cv_gcc_as_const_division_with_wadivide_ok=yes])])
+     if test "$gcry_cv_gcc_as_const_division_with_wadivide_ok" = "no" ; then
+@@ -1715,7 +1720,8 @@ if test $amd64_as_feature_detection = yes; then
+ 		 * and "-Wa,--divide" workaround failed, this causes assembly
+ 		 * to be disable on this machine. */
+ 		"xorl \$(123456789/12345678), %ebp;\n\t"
+-            );]], [ asmfunc(); ])],
++            );
++	    void asmfunc(void);]], [ asmfunc(); ])],
+           [gcry_cv_gcc_amd64_platform_as_ok=yes])
+         fi])
+   if test "$gcry_cv_gcc_amd64_platform_as_ok" = "yes" ; then
+@@ -1734,7 +1740,8 @@ if test $amd64_as_feature_detection = yes; then
+               ".globl asmfunc\n\t"
+               "asmfunc:\n\t"
+               "xorq \$(1234), %rbp;\n\t"
+-          );]], [ asmfunc(); ])],
++          );
++	  void asmfunc(void);]], [ asmfunc(); ])],
+         [gcry_cv_gcc_win64_platform_as_ok=yes])])
+     if test "$gcry_cv_gcc_win64_platform_as_ok" = "yes" ; then
+       AC_DEFINE(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS,1,
+@@ -1767,7 +1774,8 @@ AC_CACHE_CHECK([whether GCC assembler is compatible for Intel syntax assembly im
+                 "sub eax, [esp + 4];\n\t"
+                 "add dword ptr [esp + eax], 0b10101;\n\t"
+                 ".att_syntax prefix\n\t"
+-            );]], [ actest(); ])],
++            );
++	    void actest(void);]], [ actest(); ])],
+           [gcry_cv_gcc_platform_as_ok_for_intel_syntax=yes])
+         fi])
+ if test "$gcry_cv_gcc_platform_as_ok_for_intel_syntax" = "yes" ; then
+@@ -1832,6 +1840,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports NEON instructions],
+                 "vadd.u64 %q0, %q1;\n\t"
+                 "vadd.s64 %d3, %d2, %d3;\n\t"
+                 );
++	    void testfn(void);
+             ]], [ testfn(); ])],
+           [gcry_cv_gcc_inline_asm_neon=yes])
+         fi])
+@@ -1879,6 +1888,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AArch32 Crypto Extension i
+ 
+                 "vmull.p64 q0, d0, d0;\n\t"
+                 );
++	    void testfn(void);
+             ]], [ testfn(); ])],
+           [gcry_cv_gcc_inline_asm_aarch32_crypto=yes])
+         fi])
+@@ -1907,6 +1917,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AArch64 NEON instructions]
+                 "dup v0.8b, w0;\n\t"
+                 "ld4 {v0.8b,v1.8b,v2.8b,v3.8b},[x0],\#32;\n\t"
+                 );
++	    void testfn(void);
+             ]], [ testfn(); ])],
+           [gcry_cv_gcc_inline_asm_aarch64_neon=yes])
+         fi])
+@@ -1955,6 +1966,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AArch64 Crypto Extension i
+                 "pmull v0.1q, v0.1d, v31.1d;\n\t"
+                 "pmull2 v0.1q, v0.2d, v31.2d;\n\t"
+                 );
++	    void testfn(void);
+             ]], [ testfn(); ])],
+           [gcry_cv_gcc_inline_asm_aarch64_crypto=yes])
+         fi])
+@@ -2050,6 +2062,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports PowerPC AltiVec/VSX/crypto
+ 		    "vshasigmad %v0, %v1, 0, 15;\n"
+ 		    "vpmsumd %v11, %v11, %v11;\n"
+ 		  );
++	    void testfn(void);
+             ]], [ testfn(); ] )],
+           [gcry_cv_gcc_inline_asm_ppc_altivec=yes])
+         fi])
+@@ -2075,6 +2088,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports PowerISA 3.00 instructions
+ 		    "testfn:\n"
+ 		    "stxvb16x %r1,%v12,%v30;\n"
+ 		  );
++	    void testfn(void);
+             ]], [ testfn(); ])],
+           [gcry_cv_gcc_inline_asm_ppc_arch_3_00=yes])
+         fi])
+
+

diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
new file mode 100644
index 000000000000..aaa53b979288
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic linux-info 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
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
+
+# Build system only has --disable-arm-crypto-support right now
+# If changing this, update src_configure logic too.
+# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions,
+# but this looks like it might change in future. This is just a safety check
+# in case people somehow do have a CPU which only supports some. They must
+# for now disable them all if that's the case.
+REQUIRED_USE="
+	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
+	cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
+"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
+	getentropy? (
+		kernel_linux? (
+			elibc_glibc? ( >=sys-libs/glibc-2.25 )
+			elibc_musl? ( >=sys-libs/musl-1.1.20 )
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+	"${FILESDIR}"/${PN}-powerpc-darwin.patch
+	"${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch
+	"${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-configure-clang16.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+	if use kernel_linux && use getentropy; then
+		unset KV_FULL
+		get_running_version
+		if [[ -n ${KV_FULL} ]] && kernel_is -lt 3 17; then
+			eerror "The getentropy function requires the getrandom syscall."
+			eerror "This was introduced in Linux 3.17."
+			eerror "Your system is currently running Linux ${KV_FULL}."
+			eerror "Disable the 'getentropy' USE flag or upgrade your kernel."
+			die "Kernel is too old for getentropy"
+		fi
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+
+	if [[ ${CHOST} == powerpc* ]] ; then
+		# ./configure does a lot of automagic, prevent that
+		# generic ppc32+ppc64 altivec
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no
+		# power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support
+		use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no
+		# power9 vector extension, aka arch 3.00 ISA
+		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
+	# https://dev.gnupg.org/T5581
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
+	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)"
+
+		--enable-noexecstack
+		$(use_enable cpu_flags_arm_neon neon-support)
+		# See REQUIRED_USE comment above
+		$(use_enable cpu_flags_arm_aes arm-crypto-support)
+		$(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support)
+		$(use_enable cpu_flags_x86_aes aesni-support)
+		$(use_enable cpu_flags_x86_avx avx-support)
+		$(use_enable cpu_flags_x86_avx2 avx2-support)
+		$(use_enable cpu_flags_x86_padlock padlock-support)
+		$(use_enable cpu_flags_x86_sha shaext-support)
+		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+
+	if use kernel_linux; then
+		# --enable-random=getentropy requires getentropy/getrandom.
+		# --enable-random=linux enables legacy code that tries getrandom
+		# and falls back to reading /dev/random.
+		myeconfargs+=( --enable-random=$(usex getentropy getentropy linux) )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}