aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/swig-support-gcc-12.patch
blob: ece7928aa26f80298c773b0f6dfd88a6cfb8ee70 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
Fix for https://github.com/swig/swig/issues/2145 made in unreleased upstream commit
https://github.com/swig/swig/commit/76d5a9ec270a763c892ae28070e391cf99e0b7cd

diff --git a/Examples/test-suite/nested_class.i b/Examples/test-suite/nested_class.i
index b10c339493e..c778a12cf7c 100644
--- a/Examples/test-suite/nested_class.i
+++ b/Examples/test-suite/nested_class.i
@@ -201,7 +201,7 @@ struct Outer {
     Integer xx;
   } MultipleInstanceAnonDerived1, MultipleInstanceAnonDerived2, *MultipleInstanceAnonDerived3, MultipleInstanceAnonDerived4[2];
 
-#if defined(__GNUC__) || defined(_MSC_VER) || defined(SWIG)
+#if (defined(__GNUC__) && __GNUC__ < 12) || defined(_MSC_VER) || defined(SWIG)
 /* some compilers do not accept these */
   struct : public InnerMultiple {
     Integer xx;
gheader'>2021-05-03nls: Do not update po files on first make invocation.Julien Lepiller We need to update the minimal gettext version to take advantage of new features. Before this patch, the first make invocation would modify po/guix and po/packages po files, and we advised to run `git checkout po` to clean the changes. * configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.19.1. * po/guix/Makevars: Set PO_DEPENDS_ON_POT to no. * po/packages/Makevars: Set PO_DEPENDS_ON_POT to no. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> 2021-04-25import: Remove Nix importer.Ludovic Courtès This importer has suffered from bitrot and no longer works with current Nix and Nixpkgs. See <https://bugs.gnu.org/32339> and <https://bugs.gnu.org/36255>. * guix/import/snix.scm, guix/scripts/import/nix.scm, tests/snix.scm: Remove. * Makefile.am (MODULES, SCM_TESTS): Remove them. * guix/scripts/import.scm (importers): Remove "nix". * build-aux/test-env.in: Remove NIXPKGS variable. * configure.ac: Remove '--with-nixpkgs' option. * doc/guix.texi (Invoking guix import): Remove bit about "guix import nix". * etc/completion/fish/guix.fish: Likewise. 2021-04-23build: Add a check for Guile-Lib.Maxim Cournoyer * configure.ac: Check if the Guile-Lib module is present and recent enough and warn in case it isn't. 2021-03-17maint: Check whether Guile-zlib is recent enough.Ludovic Courtès This is a followup to a04aef2430645357d7796969d4b6453478ff8a3f. * m4/guix.m4 (GUIX_CHECK_GUILE_ZLIB): New macro. * configure.ac: Use it when checking for Guile-zlib.