mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 19:02:57 +00:00
3f4ad3d37d
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. Refs https://github.com/NixOS/nixpkgs/issues/115177
16 lines
676 B
Diff
16 lines
676 B
Diff
diff -u ./configure ../bash-4.4-fixed/configure
|
|
--- ./configure 2016-09-07 22:57:01.000000000 +0200
|
|
+++ ../bash-4.4-fixed/configure 2020-01-08 14:10:26.316858174 +0100
|
|
@@ -16064,10 +16064,7 @@
|
|
solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
|
|
lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
|
|
linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
|
|
- case "`uname -r`" in
|
|
- 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h
|
|
- ;;
|
|
- esac ;;
|
|
+ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;;
|
|
*qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;;
|
|
*qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
|
|
powerux*) LOCAL_LIBS="-lgen" ;;
|