branch master updated: gnu: dbacl: Fix failing check phase.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 03ab1a2762 gnu: dbacl: Fix failing check phase.
03ab1a2762 is described below

commit 03ab1a27620d18f7e09ef7cc28f62d0a0c78b186
Author: Danny O'Brien <danny@fil.org>
AuthorDate: Sat Mar 4 23:24:37 2023 -0800

    gnu: dbacl: Fix failing check phase.
    
    * gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/textutils.scm (dbacl) [source]: Apply patch.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/local.mk                                       |  1 +
 .../dbacl-icheck-multiple-definitions.patch        | 33 ++++++++++++++++++++++
 gnu/packages/textutils.scm                         |  3 +-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2abece0d2f..186d82a8ab 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1035,6 +1035,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/date-output-pkg-config-files.patch      \
   %D%/packages/patches/datefudge-gettimeofday.patch            \
   %D%/packages/patches/dbacl-include-locale.h.patch            \
+  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch         \
   %D%/packages/patches/dbus-helper-search-path.patch           \
   %D%/packages/patches/dbus-c++-gcc-compat.patch               \
   %D%/packages/patches/dbus-c++-threading-mutex.patch          \
diff --git a/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch 
b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
new file mode 100644
index 0000000000..e82d0819bb
--- /dev/null
+++ b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
@@ -0,0 +1,33 @@
+From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001
+From: Danny O'Brien <danny@spesh.com>
+Date: Fri, 3 Feb 2023 16:48:59 -0800
+Subject: [PATCH] Fix failing build of icheck.
+
+Building icheck fails with a duplicate symbol definition 
+error. This allows the icheck executable to compile.
+
+Submitted upstream[1] but not yet moderated/accepted.
+
+[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/
+
+---
+ src/icheck.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/icheck.c b/src/icheck.c
+index efbb6a5..12a3b7a 100644
+--- a/src/icheck.c
++++ b/src/icheck.c
+@@ -39,9 +39,6 @@ extern regex_count_t regex_count;
+ extern empirical_t empirical;
+ 
+ extern int cmd;
+-char *progname = "icheck";
+-char *inputfile = "";
+-long inputline = 0;
+ 
+ extern long system_pagesize;
+ extern void *in_iobuf;
+-- 
+2.39.1
+
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index e5d3a0efc0..fb8bc7e868 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -711,7 +711,8 @@ in a portable way.")
                            "dbacl-" version ".tar.gz"))
        (sha256
         (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
-       (patches (search-patches "dbacl-include-locale.h.patch"))))
+       (patches (search-patches "dbacl-include-locale.h.patch"
+                                "dbacl-icheck-multiple-definitions.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags