pyrox.dev / nixpkgs
lol
fork atom

Merge #117210: bash_5: don't rely on patch timestamps

Vladimír Čunát ad47284f a9b3e262

+1 -16
unified split
+1 -1
pkgs/shells/bash/5.1.nix
··· 45 -DSSH_SOURCE_BASHRC 46 ''; 47 48 - patchFlags = [ "-p0" "-T" ]; 49 50 patches = upstreamPatches 51 ++ [ ./pgrp-pipe-5.1.patch ];
··· 45 -DSSH_SOURCE_BASHRC 46 ''; 47 48 + patchFlags = [ "-p0" ]; 49 50 patches = upstreamPatches 51 ++ [ ./pgrp-pipe-5.1.patch ];
-15
pkgs/shells/bash/pgrp-pipe-5.1.patch
··· 14 netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; 15 *qnx[67]*) LOCAL_LIBS="-lncurses" ;; 16 *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; 17 - diff -u ./configure.ac ../bash-5.0-fixed/configure.ac 18 - --- ./configure.ac 2019-01-02 15:39:11.000000000 +0100 19 - +++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100 20 - @@ -1108,10 +1108,7 @@ 21 - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; 22 - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; 23 - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading 24 - - case "`uname -r`" in 25 - - 1.*|2.[[0123]]*) : ;; 26 - - *) AC_DEFINE(PGRP_PIPE) ;; 27 - - esac ;; 28 - + AC_DEFINE(PGRP_PIPE) ;; 29 - netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; 30 - *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; 31 - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
··· 14 netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; 15 *qnx[67]*) LOCAL_LIBS="-lncurses" ;; 16 *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;