02/02: gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems.

[guix-commits]

mhw pushed a commit to branch core-updates-next
in repository guix.

commit 82eaac49ac983f28768d6623d802f41cbd7f779b
Author: Mark H Weaver <address@hidden>
Date:   Thu Aug 15 16:45:03 2019 -0400

    gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems.
    
    * gnu/packages/patches/bash-linux-pgrp-pipe.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/bash.scm (bash)[source]: Add the patch.
---
 gnu/local.mk                                    |  1 +
 gnu/packages/bash.scm                           |  3 ++-
 gnu/packages/patches/bash-linux-pgrp-pipe.patch | 32 +++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 08bc205..2e6d477 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -697,6 +697,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/awesome-reproducible-png.patch          \
   %D%/packages/patches/azr3.patch                              \
   %D%/packages/patches/bash-completion-directories.patch       \
+  %D%/packages/patches/bash-linux-pgrp-pipe.patch              \
   %D%/packages/patches/bastet-change-source-of-unordered_set.patch     \
   %D%/packages/patches/bazaar-CVE-2017-14176.patch             \
   %D%/packages/patches/beets-python-3.7-fix.patch              \
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index d3abeec..f1ef704 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -115,7 +115,8 @@ number/base32-hash tuples, directly usable in the 
'patch-series' form."
                (base32
                 "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l"))
               (patch-flags '("-p0"))
-              (patches %patch-series-5.0)))
+              (patches (cons (search-patch "bash-linux-pgrp-pipe.patch")
+                             %patch-series-5.0))))
      (version (string-append version "." (number->string (length 
%patch-series-5.0))))
      (build-system gnu-build-system)
 
diff --git a/gnu/packages/patches/bash-linux-pgrp-pipe.patch 
b/gnu/packages/patches/bash-linux-pgrp-pipe.patch
new file mode 100644
index 0000000..234a55e
--- /dev/null
+++ b/gnu/packages/patches/bash-linux-pgrp-pipe.patch
@@ -0,0 +1,32 @@
+Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of
+the kernel version in use on the build machine.
+
+--- configure.ac.orig  2019-01-02 09:38:44.000000000 -0500
++++ configure.ac       2019-08-15 16:40:24.271758379 -0400
+@@ -1108,10 +1108,7 @@
+ solaris2*)    LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*)      LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*)               LOCAL_LDFLAGS=-rdynamic          # allow dynamic loading
+-              case "`uname -r`" in
+-              1.*|2.[[0123]]*)        : ;;
+-              *)      AC_DEFINE(PGRP_PIPE) ;;
+-              esac ;;
++              AC_DEFINE(PGRP_PIPE) ;;
+ netbsd*|openbsd*)     LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ *qnx[[67]]*)  LOCAL_LIBS="-lncurses" ;;
+ *qnx*)                LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" 
LOCAL_LIBS="-lunix -lncurses" ;;
+--- configure.orig     2019-01-02 09:43:04.000000000 -0500
++++ configure  2019-08-15 16:41:44.440155912 -0400
+@@ -16312,11 +16312,7 @@
+ solaris2*)    LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*)      LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*)               LOCAL_LDFLAGS=-rdynamic          # allow dynamic loading
+-              case "`uname -r`" in
+-              1.*|2.[0123]*)  : ;;
+-              *)      $as_echo "#define PGRP_PIPE 1" >>confdefs.h
+- ;;
+-              esac ;;
++              $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;;
+ netbsd*|openbsd*)     LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ *qnx[67]*)    LOCAL_LIBS="-lncurses" ;;
+ *qnx*)                LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" 
LOCAL_LIBS="-lunix -lncurses" ;;