git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #37658 from pbogdan/gnumake3-remove

gnumake3: remove

commit3516b2dad23c59bc66cf2b67d8df45e76fc81f61 authorJörg Thalheim <Mic92@users.noreply.github.com> dateThu 15 Nov 2018, 21:12 (8 years ago) parentc9578082c60a41
17 files changed+8−620
pkgs/applications/science/logic/coq2html/default.nix+2−2 pkgs/development/libraries/lensfun/default.nix+3−3 pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch−14 pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch−48 pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch−71 pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch−58 pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch−17 pkgs/development/tools/build-managers/gnumake/3.82/default.nix−62 pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch−104 pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch−34 pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch−46 pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch−54 pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch−37 pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch−24 pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch−39 pkgs/tools/networking/ngrep/default.nix+2−2 pkgs/top-level/all-packages.nix+1−5
pkgs/applications/science/logic/coq2html/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, make, fetchgit, ocaml }:
1+{ stdenv, fetchgit, ocaml }:
22
33let
44 version = "20170720";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
1414 };
1515
16− buildInputs = [ make ocaml ];
16+ buildInputs = [ ocaml ];
1717
1818 installPhase = ''
1919 mkdir -p $out/bin
pkgs/development/libraries/lensfun/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }:
1+{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }:
22
33stdenv.mkDerivation rec {
44 version = "0.3.95";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ glib zlib libpng cmake gnumake3 ];
12+ nativeBuildInputs = [ cmake pkgconfig ];
13+ buildInputs = [ glib zlib libpng ];
1414
1515 configureFlags = [ "-v" ];
1616
pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patchdeleted−14
@@ -1,14 +0,0 @@
1−http://bugs.gentoo.org/331975
2−https://savannah.gnu.org/bugs/?30723
3−
4−--- main.c 2010/07/19 07:10:53 1.243
5−+++ main.c 2010/08/10 07:35:34 1.244
6−@@ -2093,7 +2093,7 @@
7− const char *pv = define_makeflags (1, 1);
8− char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
9− sprintf (p, "MAKEFLAGS=%s", pv);
10−- putenv (p);
11−+ putenv (allocated_variable_expand (p));
12− }
13−
14− if (ISDB (DB_BASIC))
pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patchdeleted−48
@@ -1,48 +0,0 @@
1−diff -u -p -r1.193 -r1.194
2−--- read.c 13 Jul 2010 01:20:42 -0000 1.193
3−+++ read.c 14 Aug 2010 02:50:14 -0000 1.194
4−@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
5− {
6− /* This looks like the first element in an open archive group.
7− A valid group MUST have ')' as the last character. */
8−- const char *e = p + nlen;
9−+ const char *e = p;
10− do
11− {
12− e = next_token (e);
13−@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
14− Go to the next item in the string. */
15− if (flags & PARSEFS_NOGLOB)
16− {
17−- NEWELT (concat (2, prefix, tp));
18−+ NEWELT (concat (2, prefix, tmpbuf));
19− continue;
20− }
21−
22− /* If we get here we know we're doing glob expansion.
23− TP is a string in tmpbuf. NLEN is no longer used.
24− We may need to do more work: after this NAME will be set. */
25−- name = tp;
26−+ name = tmpbuf;
27−
28− /* Expand tilde if applicable. */
29−- if (tp[0] == '~')
30−+ if (tmpbuf[0] == '~')
31− {
32−- tildep = tilde_expand (tp);
33−+ tildep = tilde_expand (tmpbuf);
34− if (tildep != 0)
35− name = tildep;
36− }
37−@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
38− else
39− {
40− /* We got a chain of items. Attach them. */
41−- (*newp)->next = found;
42−+ if (*newp)
43−+ (*newp)->next = found;
44−+ else
45−+ *newp = found;
46−
47− /* Find and set the new end. Massage names if necessary. */
48− while (1)
pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patchdeleted−71
@@ -1,71 +0,0 @@
1−https://savannah.gnu.org/bugs/?23922
2−
3−From 6f3684710a0f832533191f8657a57bc2fbba90ba Mon Sep 17 00:00:00 2001
4−From: eliz <eliz>
5−Date: Sat, 7 May 2011 08:29:13 +0000
6−Subject: [PATCH] job.c (construct_command_argv_internal): Don't assume
7− shellflags is always non-NULL. Escape-protect characters
8− special to the shell when copying the value of SHELL into
9− new_line. Fixes Savannah bug #23922.
10−
11−---
12− ChangeLog | 7 +++++++
13− job.c | 23 ++++++++++++++++-------
14− 2 files changed, 23 insertions(+), 7 deletions(-)
15−
16−diff --git job.c job.c
17−index 67b402d..c2ce84d 100644
18−--- job.c
19−+++ job.c
20−@@ -2844,12 +2844,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
21−
22− unsigned int shell_len = strlen (shell);
23− unsigned int line_len = strlen (line);
24−- unsigned int sflags_len = strlen (shellflags);
25−+ unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
26− char *command_ptr = NULL; /* used for batch_mode_shell mode */
27− char *new_line;
28−
29− # ifdef __EMX__ /* is this necessary? */
30−- if (!unixy_shell)
31−+ if (!unixy_shell && shellflags)
32− shellflags[0] = '/'; /* "/c" */
33− # endif
34−
35−@@ -2911,19 +2911,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
36−
37− new_argv = xmalloc (4 * sizeof (char *));
38− new_argv[0] = xstrdup(shell);
39−- new_argv[1] = xstrdup(shellflags);
40−+ new_argv[1] = xstrdup(shellflags ? shellflags : "");
41− new_argv[2] = line;
42− new_argv[3] = NULL;
43− return new_argv;
44− }
45−
46−- new_line = alloca (shell_len + 1 + sflags_len + 1
47−+ new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
48− + (line_len*2) + 1);
49− ap = new_line;
50−- memcpy (ap, shell, shell_len);
51−- ap += shell_len;
52−+ /* Copy SHELL, escaping any characters special to the shell. If
53−+ we don't escape them, construct_command_argv_internal will
54−+ recursively call itself ad nauseam, or until stack overflow,
55−+ whichever happens first. */
56−+ for (p = shell; *p != '\0'; ++p)
57−+ {
58−+ if (strchr (sh_chars, *p) != 0)
59−+ *(ap++) = '\\';
60−+ *(ap++) = *p;
61−+ }
62− *(ap++) = ' ';
63−- memcpy (ap, shellflags, sflags_len);
64−+ if (shellflags)
65−+ memcpy (ap, shellflags, sflags_len);
66− ap += sflags_len;
67− *(ap++) = ' ';
68− command_ptr = ap;
69−--
70−1.7.12
71−
pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patchdeleted−58
@@ -1,58 +0,0 @@
1−fix from upstream cvs
2−
3−----------------------------
4−revision 1.58
5−date: 2011-08-29 12:20:19 -0400; author: psmith; state: Exp; lines: +7 -13; commitid: MdH0jSxpuIy7mqxv;
6−Save strings we're expanding in case an embedded eval causes them
7−to be freed (if they're the value of a variable that's reset for example).
8−See Savannah patch #7534
9−
10−Index: expand.c
11−===================================================================
12−RCS file: /sources/make/make/expand.c,v
13−retrieving revision 1.57
14−retrieving revision 1.58
15−diff -u -p -r1.57 -r1.58
16−--- expand.c 7 May 2011 20:03:49 -0000 1.57
17−+++ expand.c 29 Aug 2011 16:20:19 -0000 1.58
18−@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons
19− {
20− struct variable *v;
21− const char *p, *p1;
22−- char *abuf = NULL;
23−+ char *save;
24− char *o;
25− unsigned int line_offset;
26−
27−@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons
28− return (variable_buffer);
29− }
30−
31−- /* If we want a subset of the string, allocate a temporary buffer for it.
32−- Most of the functions we use here don't work with length limits. */
33−- if (length > 0 && string[length] != '\0')
34−- {
35−- abuf = xmalloc(length+1);
36−- memcpy(abuf, string, length);
37−- abuf[length] = '\0';
38−- string = abuf;
39−- }
40−- p = string;
41−+ /* We need a copy of STRING: due to eval, it's possible that it will get
42−+ freed as we process it (it might be the value of a variable that's reset
43−+ for example). Also having a nil-terminated string is handy. */
44−+ save = length < 0 ? xstrdup (string) : xstrndup (string, length);
45−+ p = save;
46−
47− while (1)
48− {
49−@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons
50− ++p;
51− }
52−
53−- if (abuf)
54−- free (abuf);
55−+ free (save);
56−
57− variable_buffer_output (o, "", 1);
58− return (variable_buffer + line_offset);
pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patchdeleted−17
@@ -1,17 +0,0 @@
1−Fixed default libpatttern on Darwin, imported from prefix overlay.
2−Got merged upstream:
3−https://savannah.gnu.org/bugs/?37197
4−--- default.c.orig 2009-05-02 12:25:24 +0200
5−+++ default.c 2009-05-02 12:25:58 +0200
6−@@ -509,7 +509,11 @@
7− #ifdef __MSDOS__
8− ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
9− #else
10−+#ifdef __APPLE__
11−+ ".LIBPATTERNS", "lib%.dylib lib%.a",
12−+#else
13− ".LIBPATTERNS", "lib%.so lib%.a",
14−+#endif
15− #endif
16− #endif
17−
pkgs/development/tools/build-managers/gnumake/3.82/default.nixdeleted−62
@@ -1,62 +0,0 @@
1−{stdenv, fetchurl}:
2−
3−let version = "3.82"; in
4−stdenv.mkDerivation {
5− name = "gnumake-${version}";
6−
7− src = fetchurl {
8− url = "mirror://gnu/make/make-${version}.tar.bz2";
9− sha256 = "0ri98385hsd7li6rh4l5afcq92v8l2lgiaz85wgcfh4w2wzsghg2";
10− };
11−
12− /* On Darwin, there are 3 test failures that haven't been investigated
13− yet. On cygwin at least parallelsim test hangs. */
14− doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.isCygwin;
15−
16− patches =
17− [
18− # Purity: don't look for library dependencies (of the form
19− # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway.
20− # Likewise, when searching for included Makefiles, don't look in
21− # /usr/include and friends.
22− ./impure-dirs.patch
23−
24− # a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
25− ./archives-many-objs.patch
26− ./MAKEFLAGS-reexec.patch
27− ./memory-corruption.patch
28− ./glob-speedup.patch
29− ./copy-on-expand.patch
30− ./oneshell.patch
31− ./parallel-remake.patch
32− ./intermediate-parallel.patch
33− ./construct-command-line.patch
34− ./long-command-line.patch
35− ./darwin-library_search-dylib.patch
36−
37− # Fix support for glibc 2.27's glob
38− ../4.2/glibc-2.27-glob.patch
39− ];
40− patchFlags = "-p0";
41−
42− meta = {
43− description = "GNU Make, a program controlling the generation of non-source files from sources";
44−
45− longDescription =
46− '' Make is a tool which controls the generation of executables and
47− other non-source files of a program from the program's source files.
48−
49− Make gets its knowledge of how to build your program from a file
50− called the makefile, which lists each of the non-source files and
51− how to compute it from other files. When you write a program, you
52− should write a makefile for it, so that it is possible to use Make
53− to build and install the program.
54− '';
55−
56− homepage = http://www.gnu.org/software/make/;
57−
58− license = stdenv.lib.licenses.gpl3Plus;
59− maintainers = [ ];
60− platforms = stdenv.lib.platforms.all;
61− };
62−}
pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patchdeleted−104
@@ -1,104 +0,0 @@
1−change from upstream to speed up by skipping unused globs
2−https://bugs.gentoo.org/382845
3−
4−http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.198&r2=1.200
5−
6−Revision 1.200
7−Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith
8−Branch: MAIN
9−Changes since 1.199: +1 -1 lines
10−Inverted the boolean test from what I wanted it to be. Added a
11−regression test to make sure this continues to work.
12−
13−Revision 1.199
14−Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith
15−Branch: MAIN
16−Changes since 1.198: +35 -25 lines
17−Avoid invoking glob() unless the filename has potential globbing
18−characters in it, for performance improvements.
19−
20−--- read.c 2011/04/29 15:27:39 1.198
21−+++ read.c 2011/05/07 14:36:12 1.200
22−@@ -2901,6 +2901,7 @@
23− const char *name;
24− const char **nlist = 0;
25− char *tildep = 0;
26−+ int globme = 1;
27− #ifndef NO_ARCHIVES
28− char *arname = 0;
29− char *memname = 0;
30−@@ -3109,32 +3110,40 @@
31− }
32− #endif /* !NO_ARCHIVES */
33−
34−- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
35−- {
36−- case GLOB_NOSPACE:
37−- fatal (NILF, _("virtual memory exhausted"));
38−-
39−- case 0:
40−- /* Success. */
41−- i = gl.gl_pathc;
42−- nlist = (const char **)gl.gl_pathv;
43−- break;
44−-
45−- case GLOB_NOMATCH:
46−- /* If we want only existing items, skip this one. */
47−- if (flags & PARSEFS_EXISTS)
48−- {
49−- i = 0;
50−- break;
51−- }
52−- /* FALLTHROUGH */
53−-
54−- default:
55−- /* By default keep this name. */
56−+ /* glob() is expensive: don't call it unless we need to. */
57−+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
58−+ {
59−+ globme = 0;
60− i = 1;
61− nlist = &name;
62−- break;
63−- }
64−+ }
65−+ else
66−+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
67−+ {
68−+ case GLOB_NOSPACE:
69−+ fatal (NILF, _("virtual memory exhausted"));
70−+
71−+ case 0:
72−+ /* Success. */
73−+ i = gl.gl_pathc;
74−+ nlist = (const char **)gl.gl_pathv;
75−+ break;
76−+
77−+ case GLOB_NOMATCH:
78−+ /* If we want only existing items, skip this one. */
79−+ if (flags & PARSEFS_EXISTS)
80−+ {
81−+ i = 0;
82−+ break;
83−+ }
84−+ /* FALLTHROUGH */
85−+
86−+ default:
87−+ /* By default keep this name. */
88−+ i = 1;
89−+ nlist = &name;
90−+ break;
91−+ }
92−
93− /* For each matched element, add it to the list. */
94− while (i-- > 0)
95−@@ -3174,7 +3183,8 @@
96− #endif /* !NO_ARCHIVES */
97− NEWELT (concat (2, prefix, nlist[i]));
98−
99−- globfree (&gl);
100−+ if (globme)
101−+ globfree (&gl);
102−
103− #ifndef NO_ARCHIVES
104− if (arname)
pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patchdeleted−34
@@ -1,34 +0,0 @@
1−diff -rc read.c read.c
2−*** read.c 2006-03-17 15:24:20.000000000 +0100
3−--- read.c 2007-05-24 17:16:31.000000000 +0200
4−***************
5−*** 99,107 ****
6−--- 99,109 ----
7− #endif
8− INCLUDEDIR,
9− #ifndef _AMIGA
10−+ #if 0
11− "/usr/gnu/include",
12− "/usr/local/include",
13− "/usr/include",
14−+ #endif
15− #endif
16− 0
17− };
18−diff -rc reremake.c
19−*** remake.c 2006-03-20 03:36:37.000000000 +0100
20−--- remake.c 2007-05-24 17:06:54.000000000 +0200
21−***************
22−*** 1452,1460 ****
23−--- 1452,1462 ----
24− static char *dirs[] =
25− {
26− #ifndef _AMIGA
27−+ #if 0
28− "/lib",
29− "/usr/lib",
30− #endif
31−+ #endif
32− #if defined(WINDOWS32) && !defined(LIBDIR)
33− /*
34− * This is completely up to the user at product install time. Just define
pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patchdeleted−46
@@ -1,46 +0,0 @@
1−diff --git remake.c remake.c
2−index c0bf709..b1ddd23 100644
3−--- remake.c
4−+++ remake.c
5−@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
6− d->file->dontcare = file->dontcare;
7− }
8−
9−+ /* We may have already considered this file, when we didn't know
10−+ we'd need to update it. Force update_file() to consider it and
11−+ not prune it. */
12−+ d->file->considered = !considered;
13−
14− dep_status |= update_file (d->file, depth);
15−
16−diff --git tests/scripts/features/parallelism tests/scripts/features/parallelism
17−index d4250f0..76d24a7 100644
18−--- tests/scripts/features/parallelism
19−+++ tests/scripts/features/parallelism
20−@@ -214,6 +214,23 @@ rm main.x");
21− rmfiles(qw(foo.y foo.y.in main.bar));
22− }
23−
24−+# Ensure intermediate/secondary files are not pruned incorrectly.
25−+# See Savannah bug #30653
26−+
27−+utouch(-15, 'file2');
28−+utouch(-10, 'file4');
29−+utouch(-5, 'file1');
30−+
31−+run_make_test(q!
32−+.INTERMEDIATE: file3
33−+file4: file3 ; @mv -f $< $@
34−+file3: file2 ; touch $@
35−+file2: file1 ; @touch $@
36−+!,
37−+ '--no-print-directory -j2', "touch file3");
38−+
39−+#rmfiles('file1', 'file2', 'file3', 'file4');
40−+
41− if ($all_tests) {
42− # Jobserver FD handling is messed up in some way.
43− # Savannah bug #28189
44−--
45−1.7.12
46−
pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patchdeleted−54
@@ -1,54 +0,0 @@
1−https://savannah.gnu.org/bugs/?36451
2−
3−From a95796de3a491d8acfc8ea94c217b90531161786 Mon Sep 17 00:00:00 2001
4−From: psmith <psmith>
5−Date: Sun, 9 Sep 2012 23:25:07 +0000
6−Subject: [PATCH] Keep the command line on the heap to avoid stack overflow.
7− Fixes Savannah bug #36451.
8−
9−---
10− ChangeLog | 3 +++
11− job.c | 13 +++++++++----
12− 2 files changed, 12 insertions(+), 4 deletions(-)
13−
14−diff --git job.c job.c
15−index 754576b..f7b7d51 100644
16−--- job.c
17−+++ job.c
18−@@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
19− return new_argv;
20− }
21−
22−- new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
23−- + (line_len*2) + 1);
24−+ new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1
25−+ + (line_len*2) + 1);
26− ap = new_line;
27− /* Copy SHELL, escaping any characters special to the shell. If
28− we don't escape them, construct_command_argv_internal will
29−@@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
30− *ap++ = *p;
31− }
32− if (ap == new_line + shell_len + sflags_len + 2)
33−- /* Line was empty. */
34−- return 0;
35−+ {
36−+ /* Line was empty. */
37−+ free (new_line);
38−+ return 0;
39−+ }
40− *ap = '\0';
41−
42− #ifdef WINDOWS32
43−@@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
44− fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
45− __FILE__, __LINE__);
46− #endif
47−+
48−+ free (new_line);
49− }
50− #endif /* ! AMIGA */
51−
52−--
53−1.7.12
54−
pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patchdeleted−37
@@ -1,37 +0,0 @@
1−--- function.c 2011/04/18 01:25:20 1.121
2−+++ function.c 2011/05/02 12:35:01 1.122
3−@@ -706,7 +706,7 @@
4− const char *word_iterator = argv[0];
5− char buf[20];
6−
7−- while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
8−+ while (find_next_token (&word_iterator, NULL) != 0)
9− ++i;
10−
11− sprintf (buf, "%d", i);
12−@@ -1133,21 +1133,14 @@
13−
14− /* Find the maximum number of words we'll have. */
15− t = argv[0];
16−- wordi = 1;
17−- while (*t != '\0')
18−+ wordi = 0;
19−+ while ((p = find_next_token (&t, NULL)) != 0)
20− {
21−- char c = *(t++);
22−-
23−- if (! isspace ((unsigned char)c))
24−- continue;
25−-
26−+ ++t;
27− ++wordi;
28−-
29−- while (isspace ((unsigned char)*t))
30−- ++t;
31− }
32−
33−- words = xmalloc (wordi * sizeof (char *));
34−+ words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
35−
36− /* Now assign pointers to each string in the array. */
37− t = argv[0];
pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patchdeleted−24
@@ -1,24 +0,0 @@
1−fix from upstream cvs
2−
3−----------------------------
4−revision 1.245
5−date: 2010-08-13 22:50:14 -0400; author: psmith; state: Exp; lines: +1 -1; commitid: 4UaslPqQHZTs5wKu;
6−- Add oneshell to $(.FEATURES) (forgot that!)
7−
8−Index: main.c
9−===================================================================
10−RCS file: /sources/make/make/main.c,v
11−retrieving revision 1.244
12−retrieving revision 1.245
13−diff -u -p -r1.244 -r1.245
14−--- main.c 10 Aug 2010 07:35:34 -0000 1.244
15−+++ main.c 14 Aug 2010 02:50:14 -0000 1.245
16−@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
17− a macro and some compilers (MSVC) don't like conditionals in macros. */
18− {
19− const char *features = "target-specific order-only second-expansion"
20−- " else-if shortest-stem undefine"
21−+ " else-if shortest-stem undefine oneshell"
22− #ifndef NO_ARCHIVES
23− " archives"
24− #endif
pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patchdeleted−39
@@ -1,39 +0,0 @@
1−fix from upstream cvs
2−
3−----------------------------
4−revision 1.247
5−date: 2011-09-18 19:39:26 -0400; author: psmith; state: Exp; lines: +5 -3; commitid: 07NxO4T5PiWC82Av;
6−When we re-exec the master makefile in a jobserver environment, ensure
7−that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
8−See Savannah bug #33873.
9−
10−Index: main.c
11−===================================================================
12−RCS file: /sources/make/make/main.c,v
13−retrieving revision 1.246
14−retrieving revision 1.247
15−diff -u -p -r1.246 -r1.247
16−--- main.c 29 Aug 2010 23:05:27 -0000 1.246
17−+++ main.c 18 Sep 2011 23:39:26 -0000 1.247
18−@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
19−
20− ++restarts;
21−
22−+ /* If we're re-exec'ing the first make, put back the number of
23−+ job slots so define_makefiles() will get it right. */
24−+ if (master_job_slots)
25−+ job_slots = master_job_slots;
26−+
27− /* Reset makeflags in case they were changed. */
28− {
29− const char *pv = define_makeflags (1, 1);
30−@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
31− && (*(unsigned int *) cs->value_ptr ==
32− *(unsigned int *) cs->noarg_value))
33− ADD_FLAG ("", 0); /* Optional value omitted; see below. */
34−- else if (cs->c == 'j')
35−- /* Special case for `-j'. */
36−- ADD_FLAG ("1", 1);
37− else
38− {
39− char *buf = alloca (30);
pkgs/tools/networking/ngrep/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, gnumake3, pcre }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, pcre }:
22
33stdenv.mkDerivation rec {
44 name = "ngrep-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 })
1919 ];
2020
21− nativeBuildInputs = [ autoreconfHook gnumake3 ];
21+ nativeBuildInputs = [ autoreconfHook ];
2222 buildInputs = [ libpcap pcre ];
2323
2424 configureFlags = [
pkgs/top-level/all-packages.nix+1−5
@@ -8537,8 +8537,6 @@ with pkgs;
85378537 gnum4 = callPackage ../development/tools/misc/gnum4 { };
85388538 m4 = gnum4;
85398539
8540− gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
8541− gnumake3 = gnumake382;
85428540 gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
85438541 gnumake = gnumake42;
85448542
@@ -21447,9 +21445,7 @@ with pkgs;
2144721445 coqPackages coq
2144821446 ;
2144921447
21450− coq2html = callPackage ../applications/science/logic/coq2html {
21451− make = pkgs.gnumake3;
21452− };
21448+ coq2html = callPackage ../applications/science/logic/coq2html { };
2145321449
2145421450 cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
2145521451