diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-libs/libgcrypt/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-libs/libgcrypt/files')
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch | 35 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch | 26 |
2 files changed, 35 insertions, 26 deletions
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch new file mode 100644 index 000000000000..e665749db3a5 --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch @@ -0,0 +1,35 @@ +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=c0692324fe8b3806eefc5017767917dca9cd94d0 +https://dev.gnupg.org/T5976 +https://bugs.gentoo.org/832871 + +From c0692324fe8b3806eefc5017767917dca9cd94d0 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Tue, 17 May 2022 10:44:55 +0900 +Subject: [PATCH] mpi: Allow building with --disable-asm for HPPA. + +* mpi/longlong.h [__hppa] (udiv_qrnnd): Only define +when assembler is enabled. + +-- + +GnuPG-bug-id: 5976 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +--- a/mpi/longlong.h ++++ b/mpi/longlong.h +@@ -430,14 +430,14 @@ extern UDItype __udiv_qrnnd (); + # define UMUL_TIME 40 + # define UDIV_TIME 80 + # endif +-# ifndef LONGLONG_STANDALONE ++# if !defined(LONGLONG_STANDALONE) && !defined(ASM_DISABLED) + # define udiv_qrnnd(q, r, n1, n0, d) \ + do { USItype __r; \ + (q) = __udiv_qrnnd (&__r, (n1), (n0), (d)); \ + (r) = __r; \ + } while (0) + extern USItype __udiv_qrnnd (); +-# endif /* !LONGLONG_STANDALONE */ ++# endif /* !LONGLONG_STANDALONE && !ASM_DISABLED */ + # define count_leading_zeros(count, x) \ + do { \ + USItype __tmp; \ diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch deleted file mode 100644 index 22bfac3104bc..000000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch +++ /dev/null @@ -1,26 +0,0 @@ -The version taken from GnuPG 1.4 assumes any cross-compiled package have -prefixed underscores, which is not the case; by using libtool's own macro, -we can avoid the whole issue. - ---- libgcrypt-1.6.1/configure.ac -+++ libgcrypt-1.6.1/configure.ac -@@ -1022,7 +1022,7 @@ - # Check whether underscores in symbols are required. This needs to be - # done before setting up the assembler stuff. - # --GNUPG_SYS_SYMBOL_UNDERSCORE() -+LT_SYS_SYMBOL_USCORE - - - ################################# ---- libgcrypt-1.6.1/mpi/config.links -+++ libgcrypt-1.6.1/mpi/config.links -@@ -362,7 +362,7 @@ - - # Make sysdep.h - echo '/* created by config.links - do not edit */' >./mpi/sysdep.h --if test x$ac_cv_sys_symbol_underscore = xyes; then -+if test x$sys_symbol_underscore = xyes; then - cat <<EOF >>./mpi/sysdep.h - #if __STDC__ - #define C_SYMBOL_NAME(name) _##name |