From unknown Sun Jun 22 08:05:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31047] [PATCH] gnu: 4store: Remove preprocessor directive. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Apr 2018 16:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31047 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31047@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.15227712035618 (code B ref -1); Tue, 03 Apr 2018 16:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2018 16:00:03 +0000 Received: from localhost ([127.0.0.1]:37279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3OLr-0001SY-HB for submit@debbugs.gnu.org; Tue, 03 Apr 2018 12:00:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3OLo-0001RW-86 for submit@debbugs.gnu.org; Tue, 03 Apr 2018 12:00:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3OLh-0002o5-S3 for submit@debbugs.gnu.org; Tue, 03 Apr 2018 11:59:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:38745) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3OLh-0002nz-Np for submit@debbugs.gnu.org; Tue, 03 Apr 2018 11:59:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3OLg-0004v5-HH for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3OLc-0002m5-Fi for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:52 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3OLc-0002lx-9C for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:48 -0400 Received: from ip-80-113-14-101.ip.prioritytelecom.net ([80.113.14.101]:56821 helo=yellowstone) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1f3OLb-0007Yr-MJ for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:48 -0400 User-agent: mu4e 1.0; emacs 25.3.1 From: Roel Janssen Message-ID: <87zi2k5lkw.fsf@gnu.org> Date: Tue, 03 Apr 2018 17:59:41 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) 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: -5.0 (-----) --=-=-= Content-Type: text/plain Dear Guix, The following patch fixes 4store's build. Kind regards, Roel Janssen --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-4store-Remove-preprocessor-directive.patch >From c199e8bc2ae4db3ecd8dcc4267619d9fdc2e9a1b Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 3 Apr 2018 17:47:05 +0200 Subject: [PATCH] gnu: 4store: Remove preprocessor directive. * gnu/packages/databases.scm (4store): Add patch to remove preprocessor directive. * gnu/packages/patches/4store-unset-preprocessor-directive.patch: New file. * gnu/local.mk: Register patch. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 3 ++- .../patches/4store-unset-preprocessor-directive.patch | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/4store-unset-preprocessor-directive.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2705fb37a..1481d0706 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -544,6 +544,7 @@ MODULES_NOT_COMPILED += \ patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ %D%/packages/patches/4store-fix-buildsystem.patch \ + %D%/packages/patches/4store-unset-preprocessor-directive.patch \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b08ac60f8..d9f750b33 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -125,7 +125,8 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "004fmcf1w75zhc1x3zc6kc97j4jqn2v5nhk6yb3z3cpfrhzi9j50")) - (patches (list (search-patch "4store-fix-buildsystem.patch"))))) + (patches (list (search-patch "4store-unset-preprocessor-directive.patch") + (search-patch "4store-fix-buildsystem.patch"))))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/4store-unset-preprocessor-directive.patch b/gnu/packages/patches/4store-unset-preprocessor-directive.patch new file mode 100644 index 000000000..c4b1d6eda --- /dev/null +++ b/gnu/packages/patches/4store-unset-preprocessor-directive.patch @@ -0,0 +1,16 @@ +This patch removes the _XOPEN_SOURCE preprocessor directive as it does not seem to be needed. +Setting it removes the definition of strdup, which is used in filter-datatypes.c. + +Patch by Roel Janssen +*** a/src/frontend/filter-datatypes.c 1970-01-01 01:00:00.000000000 +0100 +--- b/src/frontend/filter-datatypes.c 2018-04-03 17:39:23.177905592 +0200 +*************** +*** 18,24 **** + * Copyright (C) 2006 Steve Harris for Garlik + */ + +- #define _XOPEN_SOURCE + #include + #include + #include +--- 18,23 ---- -- 2.16.1 --=-=-=-- From unknown Sun Jun 22 08:05:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31047] [PATCH] gnu: 4store: Remove preprocessor directive. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Apr 2018 11:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31047 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Roel Janssen Cc: 31047@debbugs.gnu.org Received: via spool by 31047-submit@debbugs.gnu.org id=B31047.152284304127909 (code B ref 31047); Wed, 04 Apr 2018 11:58:01 +0000 Received: (at 31047) by debbugs.gnu.org; 4 Apr 2018 11:57:21 +0000 Received: from localhost ([127.0.0.1]:37733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3h2X-0007G5-FO for submit@debbugs.gnu.org; Wed, 04 Apr 2018 07:57:21 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:42910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3h2T-0007Fv-PM for 31047@debbugs.gnu.org; Wed, 04 Apr 2018 07:57:18 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 3E346127F0; Wed, 4 Apr 2018 13:57:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3VsESW0YqB0u; Wed, 4 Apr 2018 13:57:16 +0200 (CEST) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 67D0411E64; Wed, 4 Apr 2018 13:57:16 +0200 (CEST) From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <87zi2k5lkw.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 15 Germinal an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 04 Apr 2018 13:57:15 +0200 In-Reply-To: <87zi2k5lkw.fsf@gnu.org> (Roel Janssen's message of "Tue, 03 Apr 2018 17:59:41 +0200") Message-ID: <87d0zfdw10.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) 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 (+) Roel Janssen skribis: > From c199e8bc2ae4db3ecd8dcc4267619d9fdc2e9a1b Mon Sep 17 00:00:00 2001 > From: Roel Janssen > Date: Tue, 3 Apr 2018 17:47:05 +0200 > Subject: [PATCH] gnu: 4store: Remove preprocessor directive. > > * gnu/packages/databases.scm (4store): Add patch to remove preprocessor > directive. > * gnu/packages/patches/4store-unset-preprocessor-directive.patch: New fil= e. > * gnu/local.mk: Register patch. [...] > + (patches (list (search-patch "4store-unset-preprocessor-directive.= patch") > + (search-patch "4store-fix-buildsystem.patch"))))) You can even use =E2=80=98search-patches=E2=80=99 here. Otherwise LGTM, thanks! Ludo=E2=80=99. From unknown Sun Jun 22 08:05:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31047] [PATCH] gnu: 4store: Remove preprocessor directive. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Apr 2018 12:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31047 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 31047@debbugs.gnu.org Received: via spool by 31047-submit@debbugs.gnu.org id=B31047.15228466721183 (code B ref 31047); Wed, 04 Apr 2018 12:58:02 +0000 Received: (at 31047) by debbugs.gnu.org; 4 Apr 2018 12:57:52 +0000 Received: from localhost ([127.0.0.1]:37832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3hz6-0000J1-Cq for submit@debbugs.gnu.org; Wed, 04 Apr 2018 08:57:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3hz3-0000In-4z for 31047@debbugs.gnu.org; Wed, 04 Apr 2018 08:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3hyx-0007d1-9l for 31047@debbugs.gnu.org; Wed, 04 Apr 2018 08:57:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3hys-0007aJ-Be; Wed, 04 Apr 2018 08:57:38 -0400 Received: from ip-80-113-14-101.ip.prioritytelecom.net ([80.113.14.101]:39657 helo=yellowstone) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1f3hyr-0007fS-Tn; Wed, 04 Apr 2018 08:57:38 -0400 References: <87zi2k5lkw.fsf@gnu.org> <87d0zfdw10.fsf@gnu.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Roel Janssen In-reply-to: <87d0zfdw10.fsf@gnu.org> Date: Wed, 04 Apr 2018 14:57:35 +0200 Message-ID: <878ta33z9c.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) 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: -5.0 (-----) Ludovic Courtès writes: > Roel Janssen skribis: > >> From c199e8bc2ae4db3ecd8dcc4267619d9fdc2e9a1b Mon Sep 17 00:00:00 2001 >> From: Roel Janssen >> Date: Tue, 3 Apr 2018 17:47:05 +0200 >> Subject: [PATCH] gnu: 4store: Remove preprocessor directive. >> >> * gnu/packages/databases.scm (4store): Add patch to remove preprocessor >> directive. >> * gnu/packages/patches/4store-unset-preprocessor-directive.patch: New file. >> * gnu/local.mk: Register patch. > > [...] > >> + (patches (list (search-patch "4store-unset-preprocessor-directive.patch") >> + (search-patch "4store-fix-buildsystem.patch"))))) > > You can even use ‘search-patches’ here. Of course. Old habits die hard I suppose.. I used ‘search-patches’ and pushed in ea09f99f7. Thanks! Kind regards, Roel Janssen From unknown Sun Jun 22 08:05:45 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Roel Janssen Subject: bug#31047: closed (Re: [bug#31047] [PATCH] gnu: 4store: Remove preprocessor directive.) Message-ID: References: <877epn3z72.fsf@gnu.org> <87zi2k5lkw.fsf@gnu.org> X-Gnu-PR-Message: they-closed 31047 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 31047@debbugs.gnu.org Date: Wed, 04 Apr 2018 13:00:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1522846802-1399-1" This is a multi-part message in MIME format... ------------=_1522846802-1399-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31047: [PATCH] gnu: 4store: Remove preprocessor directive. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31047@debbugs.gnu.org. --=20 31047: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31047 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1522846802-1399-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31047-done) by debbugs.gnu.org; 4 Apr 2018 12:59:15 +0000 Received: from localhost ([127.0.0.1]:37836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3i0Q-0000LG-OW for submit@debbugs.gnu.org; Wed, 04 Apr 2018 08:59:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3i0P-0000L4-72 for 31047-done@debbugs.gnu.org; Wed, 04 Apr 2018 08:59:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3i0J-0008Qo-CD for 31047-done@debbugs.gnu.org; Wed, 04 Apr 2018 08:59:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3i0D-0008PL-2P; Wed, 04 Apr 2018 08:59:01 -0400 Received: from ip-80-113-14-101.ip.prioritytelecom.net ([80.113.14.101]:6829 helo=yellowstone) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1f3i0C-0001GQ-JQ; Wed, 04 Apr 2018 08:59:00 -0400 References: <87zi2k5lkw.fsf@gnu.org> <87d0zfdw10.fsf@gnu.org> <878ta33z9c.fsf@gnu.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Roel Janssen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#31047] [PATCH] gnu: 4store: Remove preprocessor directive. In-reply-to: <878ta33z9c.fsf@gnu.org> Date: Wed, 04 Apr 2018 14:58:57 +0200 Message-ID: <877epn3z72.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31047-done Cc: 31047-done@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: -5.0 (-----) Roel Janssen writes: > Ludovic Courtès writes: > >> Roel Janssen skribis: >> >>> From c199e8bc2ae4db3ecd8dcc4267619d9fdc2e9a1b Mon Sep 17 00:00:00 2001 >>> From: Roel Janssen >>> Date: Tue, 3 Apr 2018 17:47:05 +0200 >>> Subject: [PATCH] gnu: 4store: Remove preprocessor directive. >>> >>> * gnu/packages/databases.scm (4store): Add patch to remove preprocessor >>> directive. >>> * gnu/packages/patches/4store-unset-preprocessor-directive.patch: New file. >>> * gnu/local.mk: Register patch. >> >> [...] >> >>> + (patches (list (search-patch "4store-unset-preprocessor-directive.patch") >>> + (search-patch "4store-fix-buildsystem.patch"))))) >> >> You can even use ‘search-patches’ here. > > Of course. Old habits die hard I suppose.. > I used ‘search-patches’ and pushed in ea09f99f7. > > Thanks! > > Kind regards, > Roel Janssen I forgot to mark is as done. So here goes. Kind regards, Roel Janssen ------------=_1522846802-1399-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Apr 2018 16:00:03 +0000 Received: from localhost ([127.0.0.1]:37279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3OLr-0001SY-HB for submit@debbugs.gnu.org; Tue, 03 Apr 2018 12:00:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3OLo-0001RW-86 for submit@debbugs.gnu.org; Tue, 03 Apr 2018 12:00:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3OLh-0002o5-S3 for submit@debbugs.gnu.org; Tue, 03 Apr 2018 11:59:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:38745) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3OLh-0002nz-Np for submit@debbugs.gnu.org; Tue, 03 Apr 2018 11:59:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3OLg-0004v5-HH for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3OLc-0002m5-Fi for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:52 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3OLc-0002lx-9C for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:48 -0400 Received: from ip-80-113-14-101.ip.prioritytelecom.net ([80.113.14.101]:56821 helo=yellowstone) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1f3OLb-0007Yr-MJ for guix-patches@gnu.org; Tue, 03 Apr 2018 11:59:48 -0400 User-agent: mu4e 1.0; emacs 25.3.1 From: Roel Janssen To: guix-patches Subject: [PATCH] gnu: 4store: Remove preprocessor directive. Message-ID: <87zi2k5lkw.fsf@gnu.org> Date: Tue, 03 Apr 2018 17:59:41 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) 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: -5.0 (-----) --=-=-= Content-Type: text/plain Dear Guix, The following patch fixes 4store's build. Kind regards, Roel Janssen --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-4store-Remove-preprocessor-directive.patch >From c199e8bc2ae4db3ecd8dcc4267619d9fdc2e9a1b Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 3 Apr 2018 17:47:05 +0200 Subject: [PATCH] gnu: 4store: Remove preprocessor directive. * gnu/packages/databases.scm (4store): Add patch to remove preprocessor directive. * gnu/packages/patches/4store-unset-preprocessor-directive.patch: New file. * gnu/local.mk: Register patch. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 3 ++- .../patches/4store-unset-preprocessor-directive.patch | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/4store-unset-preprocessor-directive.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2705fb37a..1481d0706 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -544,6 +544,7 @@ MODULES_NOT_COMPILED += \ patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ %D%/packages/patches/4store-fix-buildsystem.patch \ + %D%/packages/patches/4store-unset-preprocessor-directive.patch \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b08ac60f8..d9f750b33 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -125,7 +125,8 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "004fmcf1w75zhc1x3zc6kc97j4jqn2v5nhk6yb3z3cpfrhzi9j50")) - (patches (list (search-patch "4store-fix-buildsystem.patch"))))) + (patches (list (search-patch "4store-unset-preprocessor-directive.patch") + (search-patch "4store-fix-buildsystem.patch"))))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/4store-unset-preprocessor-directive.patch b/gnu/packages/patches/4store-unset-preprocessor-directive.patch new file mode 100644 index 000000000..c4b1d6eda --- /dev/null +++ b/gnu/packages/patches/4store-unset-preprocessor-directive.patch @@ -0,0 +1,16 @@ +This patch removes the _XOPEN_SOURCE preprocessor directive as it does not seem to be needed. +Setting it removes the definition of strdup, which is used in filter-datatypes.c. + +Patch by Roel Janssen +*** a/src/frontend/filter-datatypes.c 1970-01-01 01:00:00.000000000 +0100 +--- b/src/frontend/filter-datatypes.c 2018-04-03 17:39:23.177905592 +0200 +*************** +*** 18,24 **** + * Copyright (C) 2006 Steve Harris for Garlik + */ + +- #define _XOPEN_SOURCE + #include + #include + #include +--- 18,23 ---- -- 2.16.1 --=-=-=-- ------------=_1522846802-1399-1--