From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +EcPFZKuol8PAwAA0tVLHw (envelope-from ) for ; Wed, 04 Nov 2020 13:37:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AHnuEJKuol+qDQAA1q6Kng (envelope-from ) for ; Wed, 04 Nov 2020 13:37:22 +0000 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 7C3B19404D3 for ; Wed, 4 Nov 2020 13:37:21 +0000 (UTC) Received: from localhost ([::1]:46296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaIyV-0006Jq-Qz for larch@yhetil.org; Wed, 04 Nov 2020 08:37:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaIyG-0006JN-VV for guix-patches@gnu.org; Wed, 04 Nov 2020 08:37:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kaIyF-0002Ij-CB for guix-patches@gnu.org; Wed, 04 Nov 2020 08:37:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kaIyF-00041c-AT for guix-patches@gnu.org; Wed, 04 Nov 2020 08:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44440] [WIP PATCH 2/2] gnu: bdb: Fix building with GCC 9. References: <20201104133427.4120918-1-kuba@kadziolka.net> In-Reply-To: <20201104133427.4120918-1-kuba@kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Nov 2020 13:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44440@debbugs.gnu.org Received: via spool by 44440-submit@debbugs.gnu.org id=B44440.160449700215429 (code B ref 44440); Wed, 04 Nov 2020 13:37:03 +0000 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: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.49 X-TUID: pI2VzyYZDUyK * 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