diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-08-11 10:35:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-08-11 10:35:46 +0200 |
| commit | 8ba24c8eb46ffb68a74d9609aee589c08652b48c (patch) | |
| tree | 676bab22f8db610bd553a03e2a64820245866c38 /pkgs/shells | |
| parent | 02802f83b78833972f2615affda9f968328d2869 (diff) | |
| parent | 99e148dd2719749c3e4c141161ca62dd177276a2 (diff) | |
Merge #245252: bash: fix parallel build failure on unwind_prot.o
...into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/5.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/bash/parallel.patch | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 00b4a707ed08c..6b126390c9f6e 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation rec { url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51"; sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk="; }) + # Apply parallel build fix pending upstream inclusion: + # https://savannah.gnu.org/patch/index.php?10373 + # Had to fetch manually to workaround -p0 default. + ./parallel.patch ]; configureFlags = [ diff --git a/pkgs/shells/bash/parallel.patch b/pkgs/shells/bash/parallel.patch new file mode 100644 index 0000000000000..d9a0cc28ce045 --- /dev/null +++ b/pkgs/shells/bash/parallel.patch @@ -0,0 +1,12 @@ +From https://savannah.gnu.org/patch/index.php?10373 + https://savannah.gnu.org/patch/download.php?file_id=54964 +--- Makefile.in ++++ Makefile.in +@@ -1432,6 +1432,7 @@ siglist.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + subst.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + test.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + trap.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h ++unwind_prot.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + variables.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + version.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + xmalloc.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h |