086183598e
* 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.
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
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
|