aboutsummaryrefslogtreecommitdiff
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
09Revert "gnu: maven-core-bootstrap: Fix build."...This reverts commit 1a93ff9a8b0c64ccb0e365f4e5c199e0ac8b9de6. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Bruno Victal 2023-07-09Revert "gnu: maven-embedder: Fix build."...This reverts commit 87ba11eff1b7a1784c94c897d468ba28822b0609. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Bruno Victal 2023-06-18gnu: maven-model-builder@3.0: Fix build....* gnu/packages/maven.scm (maven-3.0-model-builder)[#:phases]: Add ‘add-components-shebang’. Liliana Marie Prikler 2023-04-28gnu: maven-embedder: Fix build....* gnu/packages/maven (maven-embedder)[arguments]: Add the'add-sisu-shebang phase after unpack. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Aleksandr Vityazev 2023-04-28gnu: maven-core-bootstrap: Fix build....* gnu/packages/maven (maven-core-bootstrap)[arguments]: Add the'add-sisu-shebang phase after unpack. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Aleksandr Vityazev 2023-04-28gnu: maven-resolver-provider: Fix build....* gnu/packages/maven (maven-resolver-provider)[arguments]: Add the'add-sisu-shebang phase after unpack. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Aleksandr Vityazev 2023-04-28gnu: maven-model-builder: Fix build....* gnu/packages/maven (maven-model-builder)[arguments]: Add the'add-sisu-shebang phase after unpack. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Aleksandr Vityazev 2023-04-28gnu: maven-settings-builder: Fix build....* gnu/packages/maven (maven-settings-builder)[arguments]: Add the'add-sisu-shebang phase after unpack. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Aleksandr Vityazev 2023-01-08gnu: Move Java XML packages to new module....* gnu/packages/xml.scm (java-simple-xml, java-jaxp, java-apache-xml-commons-resolver, java-jaxen, java-xom, java-xsdlib, java-xpp3, java-xmlpull2, java-xmlpull-api-v1, java-dom4j, java-kxml2, java-stax, java-jettison, java-jdom2, java-xstream, java-mxparser): Move these variables from here... * gnu/packages/java-xml.scm: ...to this new file. * gnu/local.mk (GNU_SYSTEM_MODULES): Register new file. * gnu/packages/axoloti.scm, gnu/packages/batik.scm, gnu/packages/bioinformatics.scm, gnu/packages/groovy.scm, gnu/packages/java.scm, gnu/packages/maven.scm: Adjust module imports. Ricardo Wurmus