From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 04 08:34:45 2020 Received: (at submit) by debbugs.gnu.org; 4 Nov 2020 13:34:46 +0000 Received: from localhost ([127.0.0.1]:47922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaIw1-0003we-Lr for submit@debbugs.gnu.org; Wed, 04 Nov 2020 08:34:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:33086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaIw0-0003wX-HU for submit@debbugs.gnu.org; Wed, 04 Nov 2020 08:34:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaIw0-0005KD-AY for guix-patches@gnu.org; Wed, 04 Nov 2020 08:34:44 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:54866) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaIvx-0001tj-S9 for guix-patches@gnu.org; Wed, 04 Nov 2020 08:34:44 -0500 Received: (qmail 30603 invoked by uid 1009); 4 Nov 2020 14:34:33 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25977. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.011035 secs); 04 Nov 2020 13:34:33 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 4 Nov 2020 14:34:33 +0100 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= To: guix-patches@gnu.org Subject: [WIP PATCH 1/2] gnu: Use GCC 9 as the default compiler. Date: Wed, 4 Nov 2020 14:34:27 +0100 Message-Id: <20201104133427.4120918-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=37.59.186.212; envelope-from=kuba@kadziolka.net; helo=pat.zlotemysli.pl X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 08:34:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) * gnu/packages/commencement.scm (gcc-toolchain-7): Use MAKE-GCC-TOOLCHAIN. (gcc-toolchain-9): Change to GCC-TOOLCHAIN. * gnu/packages/gcc (gcc): Change from GCC-7 to GCC-9. (gcc-objc): Change to GCC-OBJC-9. (gcc-objc++): Change to GCC-OBJC++-9. --- Dear Guix, this short patchstack switches the default toolchain to GCC 9 and fixes enough to get hello to compile. If my memory is correct, one of the cross-compiling target still breaks. I'm not interested in trying to figure out why, so I'm sending the WIP patches your way. Regards, Jakub Kądziołka gnu/packages/commencement.scm | 4 ++-- gnu/packages/gcc.scm | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1e1c370aa8..6347dd2e1d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3868,13 +3868,13 @@ is the GNU Compiler Collection.") (make-gcc-toolchain gcc-6)) (define-public gcc-toolchain-7 - gcc-toolchain) + (make-gcc-toolchain gcc-7)) (define-public gcc-toolchain-8 (make-gcc-toolchain gcc-8)) (define-public gcc-toolchain-9 - (make-gcc-toolchain gcc-9)) + gcc-toolchain) (define-public gcc-toolchain-10 (make-gcc-toolchain gcc-10)) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4d5aaa7070..ea576dfb8d 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -585,10 +586,9 @@ It also includes runtime support libraries for these languages."))) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))))) -;; Note: When changing the default gcc version, update -;; the gcc-toolchain-* definitions and the gfortran definition -;; accordingly. -(define-public gcc gcc-7) +;; Note: When changing the default gcc version, update the definitions +;; for gcc-toolchain-{old,new}, gcc-objc and gcc-objc++. +(define-public gcc gcc-9) (define-public (make-libstdc++ gcc) "Return a libstdc++ package based on GCC. The primary use case is when @@ -826,7 +826,7 @@ provides the GNU compiler for the Go programming language.")) (custom-gcc gcc-10 "gcc-objc" '("objc") %objc-search-paths)) -(define-public gcc-objc gcc-objc-7) +(define-public gcc-objc gcc-objc-9) (define %objc++-search-paths (list (search-path-specification @@ -868,7 +868,7 @@ provides the GNU compiler for the Go programming language.")) (custom-gcc gcc-10 "gcc-objc++" '("obj-c++") %objc++-search-paths)) -(define-public gcc-objc++ gcc-objc++-7) +(define-public gcc-objc++ gcc-objc++-9) (define (make-libstdc++-doc gcc) "Return a package with the libstdc++ documentation for GCC." -- 2.29.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 04 08:36:42 2020 Received: (at 44440) by debbugs.gnu.org; 4 Nov 2020 13:36:42 +0000 Received: from localhost ([127.0.0.1]:47933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaIxp-00040i-Ly for submit@debbugs.gnu.org; Wed, 04 Nov 2020 08:36:42 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:38872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaIxk-00040H-0o for 44440@debbugs.gnu.org; Wed, 04 Nov 2020 08:36:35 -0500 Received: (qmail 32260 invoked by uid 1009); 4 Nov 2020 14:36:30 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25977. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.031024 secs); 04 Nov 2020 13:36:30 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 4 Nov 2020 14:36:30 +0100 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= To: 44440@debbugs.gnu.org Subject: [WIP PATCH 2/2] gnu: bdb: Fix building with GCC 9. Date: Wed, 4 Nov 2020 14:36:30 +0100 Message-Id: <20201104133630.4121575-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 44440 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/dbm.scm (bdb-4.8, bdb-5.3)[source]: Apply patch. * gnu/packages/patches/bdb-5.3-atomics-on-gcc-9.patch: New file. * gnu/local.mk (dist_patch_DATA): Register new file. --- gnu/local.mk | 1 + gnu/packages/dbm.scm | 8 +++++-- .../patches/bdb-5.3-atomics-on-gcc-9.patch | 22 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/bdb-5.3-atomics-on-gcc-9.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8c93e19b72..5bcb39dc9a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -817,6 +817,7 @@ dist_patch_DATA = \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/bc-fix-cross-compilation.patch \ + %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ %D%/packages/patches/beets-werkzeug-compat.patch \ %D%/packages/patches/behave-skip-a-couple-of-tests.patch \ diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index ea812c9715..a1df028d02 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,8 @@ version ".tar.gz")) (sha256 (base32 - "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0")))) + "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0")) + (patches (search-patches "bdb-5.3-atomics-on-gcc-9.patch")))) (build-system gnu-build-system) (outputs '("out" ; programs, libraries, headers "doc")) ; 94 MiB of HTML docs @@ -108,7 +110,9 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") version ".tar.gz")) (sha256 (base32 - "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))))) + "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")) + (patch-flags '("-p0")) + (patches (search-patches "bdb-5.3-atomics-on-gcc-9.patch")))))) (define-public bdb-6 (package (inherit bdb-4.8) diff --git a/gnu/packages/patches/bdb-5.3-atomics-on-gcc-9.patch b/gnu/packages/patches/bdb-5.3-atomics-on-gcc-9.patch new file mode 100644 index 0000000000..56d404da15 --- /dev/null +++ b/gnu/packages/patches/bdb-5.3-atomics-on-gcc-9.patch @@ -0,0 +1,22 @@ +Patch borrowed from Arch Linux. Allows compiling bdb 5.3 and earlier with GCC newer than 7. + +--- src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 ++++ src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 +@@ -144,7 +144,7 @@ + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_db((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __atomic_compare_exchange_db( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; -- 2.29.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 10 17:21:24 2020 Received: (at 44440) by debbugs.gnu.org; 10 Nov 2020 22:21:24 +0000 Received: from localhost ([127.0.0.1]:39260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcc0y-0001gj-EH for submit@debbugs.gnu.org; Tue, 10 Nov 2020 17:21:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcc0x-0001gX-1g for 44440@debbugs.gnu.org; Tue, 10 Nov 2020 17:21:23 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42704) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcc0p-0005VC-Jo; Tue, 10 Nov 2020 17:21:17 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=49800 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kcc0p-0005UB-2j; Tue, 10 Nov 2020 17:21:15 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= Subject: Re: [bug#44440] [WIP PATCH 1/2] gnu: Use GCC 9 as the default compiler. References: <20201104133427.4120918-1-kuba@kadziolka.net> Date: Tue, 10 Nov 2020 23:21:13 +0100 In-Reply-To: <20201104133427.4120918-1-kuba@kadziolka.net> ("Jakub =?utf-8?B?S8SFZHppb8WCa2EiJ3M=?= message of "Wed, 4 Nov 2020 14:34:27 +0100") Message-ID: <87ft5gn99i.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44440 Cc: 44440@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Jakub, Jakub K=C4=85dzio=C5=82ka skribis: > this short patchstack switches the default toolchain to GCC 9 and fixes > enough to get hello to compile. > > If my memory is correct, one of the cross-compiling target still breaks. > I'm not interested in trying to figure out why, so I'm sending the WIP > patches your way. Thanks for sharing! I=E2=80=99ll give it a spin on =E2=80=98core-updates= =E2=80=99 soonish if nobody beats me at it. Ludo=E2=80=99. PS: Congrats for getting #44440! :-) From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 16 18:19:29 2020 Received: (at 44440-done) by debbugs.gnu.org; 16 Dec 2020 23:19:29 +0000 Received: from localhost ([127.0.0.1]:34206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpg4u-0003Av-PS for submit@debbugs.gnu.org; Wed, 16 Dec 2020 18:19:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpg4s-0003Ah-4M for 44440-done@debbugs.gnu.org; Wed, 16 Dec 2020 18:19:27 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38508) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpg4m-0005hG-FZ; Wed, 16 Dec 2020 18:19:20 -0500 Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:47262 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kpg4m-00067X-2Z; Wed, 16 Dec 2020 18:19:20 -0500 From: Marius Bakke To: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= , 44440-done@debbugs.gnu.org Subject: Re: [bug#44440] [WIP PATCH 2/2] gnu: bdb: Fix building with GCC 9. In-Reply-To: <20201104133630.4121575-1-kuba@kadziolka.net> References: <20201104133427.4120918-1-kuba@kadziolka.net> <20201104133630.4121575-1-kuba@kadziolka.net> Date: Thu, 17 Dec 2020 00:19:17 +0100 Message-ID: <87eejp8hl6.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44440-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jakub K=C4=85dzio=C5=82ka skriver: > * gnu/packages/dbm.scm (bdb-4.8, bdb-5.3)[source]: Apply patch. > * gnu/packages/patches/bdb-5.3-atomics-on-gcc-9.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register new file. I pushed this patch in 04496dc5743d54134405c604ca863ce913283a0e. The incomplete GCC 9 patch will be dropped in favor of a switch to GCC 10; closing this issue. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl/alfUPHG1hcml1c0Bn bnUub3JnAAoJEKKgbfKjOlT6G2cH/RkznBED9tInnvk6vuS2zjh/d4fU23NRxiIo /XfCcF02gbn84adbr10fiZykTncMb2AxRv/BihDfS/nEvvsEResqVuYAvZzvO0Fr REk5fu1tNBNZVweBlHDF0I4/DjZKciM86x17CnytH/kHzJC5cxLs/5boB8Zw34Hg 35rUmcD2F1px5UssVZkNRuwlMOfrPodFehEenow1Eo1u1j0/I9q8g5vZ+rBQ2Dqk quvnN/UP7iXLq2k7Z67IAr7C/mT5iO+Tn+YJ8vwKdC+drxjHHRS6CFocW1FuYo0f 5eA38cDQwKNs5wgmsOsWVyB7b2839VA0/Bg7aR0Ql5DXfvrEhNw= =UJLs -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Aug 15 20:52:15 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 14 Jan 2021 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator