GNU bug report logs - #56817
[PATCH core-updates 0/3] Fix builds with GCC-12.

Previous Next

Package: guix-patches;

Reported by: Greg Hogan <code <at> greghogan.com>

Date: Thu, 28 Jul 2022 20:20:02 UTC

Severity: normal

Tags: patch

Done: Marius Bakke <marius <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56817 in the body.
You can then email your comments to 56817 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#56817; Package guix-patches. (Thu, 28 Jul 2022 20:20:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Greg Hogan <code <at> greghogan.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 28 Jul 2022 20:20:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH core-updates 0/3] Fix builds with GCC-12.
Date: Thu, 28 Jul 2022 20:19:21 +0000
Patch set containing one package update and two source patches fixing
builds with gcc <at> 12.

Have successfully built the packages both with gcc <at> 12 and gcc <at> 10.

Greg Hogan (3):
  gnu: swig: Fix build with GCC-12.
  gnu: doxygen: Fix build with GCC-12.
  gnu: vala: Update to 0.54.8.

 gnu/local.mk                                     |  2 ++
 gnu/packages/documentation.scm                   |  4 +++-
 gnu/packages/gnome.scm                           |  4 ++--
 .../patches/doxygen-support-gcc-12.patch         | 15 +++++++++++++++
 gnu/packages/patches/swig-support-gcc-12.patch   | 16 ++++++++++++++++
 gnu/packages/swig.scm                            |  4 +++-
 6 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/doxygen-support-gcc-12.patch
 create mode 100644 gnu/packages/patches/swig-support-gcc-12.patch

-- 
2.37.1





Information forwarded to guix-patches <at> gnu.org:
bug#56817; Package guix-patches. (Thu, 28 Jul 2022 20:26:02 GMT) Full text and rfc822 format available.

Message #8 received at 56817 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 56817 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH core-updates 3/3] gnu: vala: Update to 0.54.8.
Date: Thu, 28 Jul 2022 20:25:29 +0000
* gnu/packages/gnome.scm (vala): Update to 0.54.8
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2456434d62..8d56a20e2c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4322,7 +4322,7 @@ (define-public seahorse
 (define-public vala
   (package
     (name "vala")
-    (version "0.54.2")
+    (version "0.54.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/vala/"
@@ -4330,7 +4330,7 @@ (define-public vala
                                   "vala-" version ".tar.xz"))
               (sha256
                (base32
-                "048k5c6c6y7jyb961krnrb7m0kghr0yrkpnfx3j5ckbx652yfkc8"))))
+                "105w0hyrfvfz96aix5mn4a9xlxzwawg2kadfxf6g8jva91wkxyzd"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:configure-flags '("--enable-coverage")
-- 
2.37.1





Information forwarded to guix-patches <at> gnu.org:
bug#56817; Package guix-patches. (Thu, 28 Jul 2022 20:26:02 GMT) Full text and rfc822 format available.

Message #11 received at 56817 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 56817 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH core-updates 2/3] gnu: doxygen: Fix build with GCC-12.
Date: Thu, 28 Jul 2022 20:25:28 +0000
* gnu/packages/patches/doxygen-support-gcc-12.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/documentation.scm (doxygen)[source]: Add patch.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/documentation.scm                    |  4 +++-
 gnu/packages/patches/doxygen-support-gcc-12.patch | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/doxygen-support-gcc-12.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a3f9a81440..a0ba7e4adb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1004,6 +1004,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/doc++-include-directives.patch		\
   %D%/packages/patches/doc++-segfault-fix.patch			\
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch	\
+  %D%/packages/patches/doxygen-support-gcc-12.patch		\
   %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch	\
   %D%/packages/patches/dstat-skip-devices-without-io.patch	\
   %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index f71461f572..189deb9638 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -198,7 +198,9 @@ (define-public doxygen
                                         ".src.tar.gz")))
               (sha256
                (base32
-                "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"))))
+                "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"))
+              ;; Remove with next release.
+              (patches (search-patches "doxygen-support-gcc-12.patch"))))
     (build-system cmake-build-system)
     (native-inputs
      (list bison
diff --git a/gnu/packages/patches/doxygen-support-gcc-12.patch b/gnu/packages/patches/doxygen-support-gcc-12.patch
new file mode 100644
index 0000000000..01f5040dde
--- /dev/null
+++ b/gnu/packages/patches/doxygen-support-gcc-12.patch
@@ -0,0 +1,15 @@
+Fix for https://github.com/doxygen/doxygen/issues/9312 made in unreleased upstream commit
+https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa
+
+diff --git a/src/cache.h b/src/cache.h
+index 0ff3092ed5..e218eb27d2 100644
+--- a/src/cache.h
++++ b/src/cache.h
+@@ -19,6 +19,7 @@
+ #include <list>
+ #include <unordered_map>
+ #include <mutex>
++#include <utility>
+ #include <ctype.h>
+ 
+ /*! Fixed size cache for value type V using keys of type K.
-- 
2.37.1





Information forwarded to guix-patches <at> gnu.org:
bug#56817; Package guix-patches. (Thu, 28 Jul 2022 20:26:03 GMT) Full text and rfc822 format available.

Message #14 received at 56817 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 56817 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH core-updates 1/3] gnu: swig: Fix build with GCC-12.
Date: Thu, 28 Jul 2022 20:25:27 +0000
* gnu/packages/patches/swig-support-gcc-12.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/swig.scm (swig)[source]: Add patch.
---
 gnu/local.mk                                   |  1 +
 gnu/packages/patches/swig-support-gcc-12.patch | 16 ++++++++++++++++
 gnu/packages/swig.scm                          |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/swig-support-gcc-12.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 407098e895..a3f9a81440 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1816,6 +1816,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/superlu-dist-awpm-grid.patch		\
   %D%/packages/patches/superlu-dist-scotchmetis.patch		\
   %D%/packages/patches/supertux-unbundle-squirrel.patch		\
+  %D%/packages/patches/swig-support-gcc-12.patch		\
   %D%/packages/patches/swish-e-search.patch			\
   %D%/packages/patches/swish-e-format-security.patch		\
   %D%/packages/patches/symmetrica-bruch.patch			\
diff --git a/gnu/packages/patches/swig-support-gcc-12.patch b/gnu/packages/patches/swig-support-gcc-12.patch
new file mode 100644
index 0000000000..ece7928aa2
--- /dev/null
+++ b/gnu/packages/patches/swig-support-gcc-12.patch
@@ -0,0 +1,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;
diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index 1f4bd0922a..a90a5d51e8 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -43,7 +43,9 @@ (define-public swig
                                  name "-" version ".tar.gz"))
              (sha256
               (base32
-               "1z06m5zv87mha6hvys1iay810ghc1jngilfby1ms2n4d1mryjfym"))))
+               "1z06m5zv87mha6hvys1iay810ghc1jngilfby1ms2n4d1mryjfym"))
+             ;; Remove with next release.
+             (patches (search-patches "swig-support-gcc-12.patch"))))
     (build-system gnu-build-system)
     (native-inputs (list boost
                          `(,pcre "bin") ;for 'pcre-config'
-- 
2.37.1





Reply sent to Marius Bakke <marius <at> gnu.org>:
You have taken responsibility. (Thu, 01 Sep 2022 20:53:02 GMT) Full text and rfc822 format available.

Notification sent to Greg Hogan <code <at> greghogan.com>:
bug acknowledged by developer. (Thu, 01 Sep 2022 20:53:02 GMT) Full text and rfc822 format available.

Message #19 received at 56817-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <marius <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>, 56817-done <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: Re: [bug#56817] [PATCH core-updates 0/3] Fix builds with GCC-12.
Date: Thu, 01 Sep 2022 22:52:16 +0200
[Message part 1 (text/plain, inline)]
Greg Hogan <code <at> greghogan.com> skriver:

> Patch set containing one package update and two source patches fixing
> builds with gcc <at> 12.
>
> Have successfully built the packages both with gcc <at> 12 and gcc <at> 10.

Nice!

> Greg Hogan (3):
>   gnu: swig: Fix build with GCC-12.
>   gnu: doxygen: Fix build with GCC-12.

Applied these two patches.

>   gnu: vala: Update to 0.54.8.

...and dropped this, as it is obsolete since
5bbd742067015998fa4728926079f546e5023920.
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 30 Sep 2022 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 179 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.