01/01: gnu: 4store: Remove preprocessor directive.

[Roel Janssen]

roelj pushed a commit to branch master
in repository guix.

commit ea09f99f7fcdde57589f83cfc66e813b084013f9
Author: Roel Janssen <address@hidden>
Date:   Wed Apr 4 14:54:02 2018 +0200

    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(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2705fb3..1481d07 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 b08ac60..30b9320 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 (search-patches "4store-unset-preprocessor-directive.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 0000000..c4b1d6e
--- /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 <address@hidden>
+*** 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 <stdlib.h>
+  #include <string.h>
+  #include <math.h>
+--- 18,23 ----