Merge pull request #15637 from nicknovitski/gnumake-4.2

gnumake: add version 4.2

+77
+42
pkgs/development/tools/build-managers/gnumake/4.2/default.nix
···
··· 1 + { stdenv, fetchurl }: 2 + 3 + let 4 + version = "4.2"; 5 + in 6 + stdenv.mkDerivation { 7 + name = "gnumake-${version}"; 8 + 9 + src = fetchurl { 10 + url = "mirror://gnu/make/make-${version}.tar.bz2"; 11 + sha256 = "0pv5rvz5pp4njxiz3syf786d2xp4j7gzddwjvgw5zmz55yvf6p2f"; 12 + }; 13 + 14 + patchFlags = "-p0"; 15 + patches = [ 16 + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib 17 + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for 18 + # included Makefiles, don't look in /usr/include and friends. 19 + ./impure-dirs.patch 20 + ]; 21 + 22 + outputs = [ "out" "doc" ]; 23 + 24 + meta = { 25 + homepage = http://www.gnu.org/software/make/; 26 + description = "A tool to control the generation of non-source files from sources"; 27 + license = stdenv.lib.licenses.gpl3Plus; 28 + 29 + longDescription = '' 30 + Make is a tool which controls the generation of executables and 31 + other non-source files of a program from the program's source files. 32 + 33 + Make gets its knowledge of how to build your program from a file 34 + called the makefile, which lists each of the non-source files and 35 + how to compute it from other files. When you write a program, you 36 + should write a makefile for it, so that it is possible to use Make 37 + to build and install the program. 38 + ''; 39 + 40 + platforms = stdenv.lib.platforms.all; 41 + }; 42 + }
+34
pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch
···
··· 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
+1
pkgs/top-level/all-packages.nix
··· 6147 gnumake3 = self.gnumake382; 6148 gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; 6149 gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; 6150 gnumake = self.gnumake41; 6151 6152 gob2 = callPackage ../development/tools/misc/gob2 { };
··· 6147 gnumake3 = self.gnumake382; 6148 gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; 6149 gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; 6150 + gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; 6151 gnumake = self.gnumake41; 6152 6153 gob2 = callPackage ../development/tools/misc/gob2 { };