From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QBQJJezw4mLpOgEAbAwnHQ (envelope-from ) for ; Thu, 28 Jul 2022 22:26:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eLnlJOzw4mLbbQAAauVa8A (envelope-from ) for ; Thu, 28 Jul 2022 22:26:20 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 543A5724D for ; Thu, 28 Jul 2022 22:26:20 +0200 (CEST) Received: from localhost ([::1]:46046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHA5L-0005WJ-9j for larch@yhetil.org; Thu, 28 Jul 2022 16:26:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHA55-0005UW-Ei for guix-patches@gnu.org; Thu, 28 Jul 2022 16:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHA55-0002eJ-5R for guix-patches@gnu.org; Thu, 28 Jul 2022 16:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oHA55-0000yn-1V for guix-patches@gnu.org; Thu, 28 Jul 2022 16:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56817] [PATCH core-updates 1/3] gnu: swig: Fix build with GCC-12. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 20:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56817 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56817@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56817-submit@debbugs.gnu.org id=B56817.16590399583741 (code B ref 56817); Thu, 28 Jul 2022 20:26:03 +0000 Received: (at 56817) by debbugs.gnu.org; 28 Jul 2022 20:25:58 +0000 Received: from localhost ([127.0.0.1]:59482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHA50-0000yH-1i for submit@debbugs.gnu.org; Thu, 28 Jul 2022 16:25:58 -0400 Received: from mail-qv1-f45.google.com ([209.85.219.45]:44889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHA4q-0000xO-7U for 56817@debbugs.gnu.org; Thu, 28 Jul 2022 16:25:50 -0400 Received: by mail-qv1-f45.google.com with SMTP id b11so2225757qvo.11 for <56817@debbugs.gnu.org>; Thu, 28 Jul 2022 13:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t/55lIw1XfP67H1yAIPssaCjkEsx9Vf51UV808jMzPc=; b=cW8dhKXGhGOmEUshb8kryYL2/hUhrLHk4dx2M8YrUH5rmf/EvWt3EjYl6dcwKD9dAg RuccrNrip58IsCEQtVoRL4pI9e3jsZP30omcEU1PUg490pCHJccUrosjFEQpLnyRujEI U24DwxPBPf4u9Mgb4W29j3L1Qglto4wAnbaQBXdvlcLWBl2Mqdh/8phEnLhXNd79H4N6 3ADDOBnvEQXU44BuHOeeP6e6LxWdNS2ffPFVgnYBrE0Kn5JT54tsGmJJjsank7nx87Eo 5E5/ZoV0sEtgDaZEhXbpNKcRP8oszueq1CFwpTkb+/JgTQfGlYYVPcLeBy9lU1T4RFYf vC6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t/55lIw1XfP67H1yAIPssaCjkEsx9Vf51UV808jMzPc=; b=m+WFPEUcz+d9WGnE6Fm7gI/ss0SFGwyW4JDt1iVx0mRlVRmP7QrKN36dFnyIwA6ZWa 9pWCwyjikGG8cFInoJYBXF7ua+N1PrEseECA0ilMeXTr2/eCB5CGSxu9zgcYVH/zIbjt pVhmnHSfNq0Zfk0jsYdMj5ueqNaE2vIJzPNxrfWDi6NQO52Gu/67usSF/ABOZlFzC4S2 0P+Uq5cYcuhg+QFqw3f2r4dBNM4lQmy4LjtHeacvw0cpF4KbMAHqCvSbDdEfKy7cL8tU AUfTCSlJpBPRHsmAzZqzCQUsajRBHvFdIppBYYSvhsW/dDCjygDm6UdXMKZscoOUvsVm uLuQ== X-Gm-Message-State: ACgBeo0DO6Wp6ZLDSqJShcYaU/q8m9xH8hqTf4pEJxUbE0z+M7s27wGo Z/IW/ElE50IQE5r0SS1+4z4fyvQRRBwzlEj2 X-Google-Smtp-Source: AA6agR5HaGPf4n4zn/voktAqCb8PXulx/kuq2ZHHav6HmMhrJA5eQ2pUFr8zhC4mVkXlTCpTlDa3wQ== X-Received: by 2002:a05:6214:2385:b0:474:78de:f8dd with SMTP id fw5-20020a056214238500b0047478def8ddmr341217qvb.66.1659039942403; Thu, 28 Jul 2022 13:25:42 -0700 (PDT) Received: from ip-10-114-89-198.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id e10-20020ac84b4a000000b0031ed590433bsm974925qts.78.2022.07.28.13.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 13:25:42 -0700 (PDT) From: Greg Hogan Date: Thu, 28 Jul 2022 20:25:27 +0000 Message-Id: X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659039980; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=t/55lIw1XfP67H1yAIPssaCjkEsx9Vf51UV808jMzPc=; b=KK5hd1CB8je1LZkvHArcpXK/bI78o26M2VSgbLEeY1cizkyMmzxx/zuTKp5H8ia5eRVFAG 8EaZO6L8ez7o1gHr5I2RIz/F/cLv2ec4ZgnzXb6j0uek7f5GbeURTB4iSOWHgOTcCcYfbK 3ykUCZAsOq5WMyLVWUZwim+G8mGwilYJOt2ZXFaVVHzxpbLjndX/L9DgCBoRfFYtHvjL4P 405UlNw7cjCCqeeZoJWUxY9FHV81DyxPCFA8/X9TbsgT0tRdQxGn0lRbytuppVdK0zBkBl xWjhl7nWXe68sVzmxIeePh1mDu7KDeKpZIQYZXNAgTbXfBi8Yh0ttp3BuqkRpg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659039980; a=rsa-sha256; cv=none; b=l2NQWtnVDkwq38WZ0R3ctzHb76TTafr+j8A5yvSJrgES7Z8r+NA08FbR2DLGEYJcSeAmLL UqYKUvMP3kBRX4OqDaqdi/OcYFBs3MTWg+jkpI9E7BQPze9kC4V0jcNntstXKE7sSV5otP mjqSm4ISTucIBJDW80wppbhSsHwmHLElDgOQjJaBhmbexIOEXJpIZjRVX8zhHazNd3FmSV Xy6K+ANn4Jm3yMwWZQLwphnj570rF511lVVReU7cdjOgU5s6Vq7EYtBLPN6AmnHg6jaJZT 3pkOUqiHIlJxwfHfkAULec9hEea+QV1IbW2/tByFfr9s7otEBeHnF7PvCIhABA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20210112.gappssmtp.com header.s=20210112 header.b=cW8dhKXG; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.57 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20210112.gappssmtp.com header.s=20210112 header.b=cW8dhKXG; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 543A5724D X-Spam-Score: 2.57 X-Migadu-Scanner: scn1.migadu.com X-TUID: UcYXHrCmnGGh * 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