mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 19:51:17 +00:00
078c2a7341
When, after patching, `configure.ac` is newer than `configure`, the Makefile will try to regenerate `configure` from `configure.ac`. While that might usually be desirable, in this case we want to keep bootstrapping simple and directly use the `configure` from the package so we can avoid a dependency on automake. Previously, we used the `-T` parameter to automake to make sure the timestamps were okay. However, this is brittle when we update: when the timestamp of the original file changes, and no longer matches the timestamp of the original file in the patch, `patch` will show a warning but otherwise continue without updating the timestamp. This PR changes things so we only patch `configure`, so that will always have a newer timestamp. We will update bash-4.4 in a separate PR (but that one has a bigger rebuild impact so will have to target staging) Refs #115177
17 lines
682 B
Diff
17 lines
682 B
Diff
diff -u ./configure ../bash-5.0-fixed/configure
|
|
--- ./configure 2019-01-02 15:43:31.000000000 +0100
|
|
+++ ../bash-5.0-fixed/configure 2020-01-08 14:18:21.017296179 +0100
|
|
@@ -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" ;;
|