diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
| commit | 4d14902b9402a83db444d8d6818d0a4f438ce8c4 (patch) | |
| tree | 85f05a0540ebcd4a1f192096c36271a287eb9fe8 /gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch | |
| parent | 647cfcf68184e8558fcea751ef6d95b6e5d86ae1 (diff) | |
| parent | 6c50e1dc0625f89884cff40b22627091efa37708 (diff) | |
| download | guix-4d14902b9402a83db444d8d6818d0a4f438ce8c4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch')
| -rw-r--r-- | gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch new file mode 100644 index 0000000000..8a03c4d982 --- /dev/null +++ b/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch @@ -0,0 +1,34 @@ +Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of +the kernel version in use on the build machine. + +diff -purN bash-5.0-orig/configure bash-5.0/configure +--- configure 1970-01-01 01:00:00.000000000 +0100 ++++ configure 2019-09-29 11:51:42.664518665 +0200 +@@ -16312,11 +16312,7 @@ solaris2.10*) LOCAL_CFLAGS=-DSOLARIS ;; + 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" ;; +diff -purN bash-5.0-orig/configure.ac bash-5.0/configure.ac +--- configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ configure.ac 2019-09-29 11:51:10.692026225 +0200 +@@ -1108,10 +1108,7 @@ solaris2.10*) LOCAL_CFLAGS=-DSOLARIS ;; + 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" ;; |