737c83f0ff
* gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch: Remove. * gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch: New file. * gnu/packages/make-bootstrap.scm (static-bash-for-bootstrap): Update to use it. * gnu/local.mk (dist_patch_DATA): Likewise.
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
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" ;;
|