TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: gnupg-1: Fix build with gcc-10.

Browse source 
* gnu/packages/gnupg.scm (gnupg-1)[source]: Add patch.
* gnu/packages/patches/gnupg-1-build-with-gcc10.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
This commit is contained in:
Efraim Flashner 2021-08-08 13:51:11 +03:00
parent 0112675d11
commit 086183598e
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 67 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1147,6 +1147,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gnutls-guile-eintr-eagain.patch \

3
gnu/packages/gnupg.scm
View file

@ -360,7 +360,8 @@ (define-public gnupg-1
".tar.bz2"))
(sha256
(base32
"1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"))))
"1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"))
(patches (search-patches "gnupg-1-build-with-gcc10.patch"))))
(native-inputs '())
(inputs
`(("zlib" ,zlib)

64
gnu/packages/patches/gnupg-1-build-with-gcc10.patch Normal file
View file

@ -0,0 +1,64 @@
Borrowed from Debian
https://sources.debian.org/src/gnupg1/1.4.23-1.1/debian/patches/0006-fix-for-gcc10.patch/
Subject: Fix build with gcc-10
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Date: 2021-01-04
Bug: https://dev.gnupg.org/T5215
Bug-Debian: https://bugs.debian.org/957293
--- a/g10/options.h
+++ b/g10/options.h
@@ -29,6 +29,8 @@
/* Norcraft can't cope with common symbols */
#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
+#elif defined (__GNUC__) && __GNUC__ >= 10
+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
#else
#define EXTERN_UNLESS_MAIN_MODULE
#endif
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -117,6 +117,8 @@
#ifndef EXTERN_UNLESS_MAIN_MODULE
#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
+#elif defined (__GNUC__) && __GNUC__ >= 10
+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
#else
#define EXTERN_UNLESS_MAIN_MODULE
#endif
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -72,6 +72,8 @@
#ifndef EXTERN_UNLESS_MAIN_MODULE
#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
+#elif defined (__GNUC__) && __GNUC__ >= 10
+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
#else
#define EXTERN_UNLESS_MAIN_MODULE
#endif
--- a/include/memory.h
+++ b/include/memory.h
@@ -93,6 +93,8 @@
#ifndef EXTERN_UNLESS_MAIN_MODULE
#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
+#elif defined (__GNUC__) && __GNUC__ >= 10
+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
#else
#define EXTERN_UNLESS_MAIN_MODULE
#endif
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -38,6 +38,8 @@
#ifndef EXTERN_UNLESS_MAIN_MODULE
#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
+#elif defined (__GNUC__) && __GNUC__ >= 10
+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
#else
#define EXTERN_UNLESS_MAIN_MODULE
#endif