diff options
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.80/default.nix (renamed from pkgs/development/tools/build-managers/gnumake-3.80/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.80/log.patch (renamed from pkgs/development/tools/build-managers/gnumake-3.80/log.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.81/default.nix (renamed from pkgs/development/tools/build-managers/gnumake/3.81.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch (renamed from pkgs/development/tools/build-managers/gnumake/impure-dirs.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch (renamed from pkgs/development/tools/build-managers/gnumake/log-3.81.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch (renamed from pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch (renamed from pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch (renamed from pkgs/development/tools/build-managers/gnumake/construct-command-line.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch (renamed from pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch (renamed from pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/default.nix (renamed from pkgs/development/tools/build-managers/gnumake/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch (renamed from pkgs/development/tools/build-managers/gnumake/glob-speedup.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch | 34 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch (renamed from pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/log.patch (renamed from pkgs/development/tools/build-managers/gnumake/log.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch (renamed from pkgs/development/tools/build-managers/gnumake/long-command-line.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch (renamed from pkgs/development/tools/build-managers/gnumake/memory-corruption.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch (renamed from pkgs/development/tools/build-managers/gnumake/oneshell.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch (renamed from pkgs/development/tools/build-managers/gnumake/parallel-remake.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch | 17 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.0/default.nix | 49 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch | 34 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/simple-build-tool/default.nix | 2 |
23 files changed, 135 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix index b0926a7f531..b0926a7f531 100644 --- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch index fa90acfe8de..fa90acfe8de 100644 --- a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch diff --git a/pkgs/development/tools/build-managers/gnumake/3.81.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 56d2326c916..56d2326c916 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch index f6646f1d012..f6646f1d012 100644 --- a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch index b98d85a0826..b98d85a0826 100644 --- a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch diff --git a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch index a2f59657d4c..a2f59657d4c 100644 --- a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch diff --git a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch index 73c0381ced4..73c0381ced4 100644 --- a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch index aa4a1afe3fd..aa4a1afe3fd 100644 --- a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch diff --git a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch index 3f202b4db96..3f202b4db96 100644 --- a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch diff --git a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch index de7e4f61521..de7e4f61521 100644 --- a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 4f3c7defa48..4f3c7defa48 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch index 45971f33590..45971f33590 100644 --- a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch new file mode 100644 index 00000000000..f6646f1d012 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch @@ -0,0 +1,34 @@ +diff -rc read.c read.c +*** read.c 2006-03-17 15:24:20.000000000 +0100 +--- read.c 2007-05-24 17:16:31.000000000 +0200 +*************** +*** 99,107 **** +--- 99,109 ---- + #endif + INCLUDEDIR, + #ifndef _AMIGA ++ #if 0 + "/usr/gnu/include", + "/usr/local/include", + "/usr/include", ++ #endif + #endif + 0 + }; +diff -rc reremake.c +*** remake.c 2006-03-20 03:36:37.000000000 +0100 +--- remake.c 2007-05-24 17:06:54.000000000 +0200 +*************** +*** 1452,1460 **** +--- 1452,1462 ---- + static char *dirs[] = + { + #ifndef _AMIGA ++ #if 0 + "/lib", + "/usr/lib", + #endif ++ #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* + * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch index 9bb7add0bde..9bb7add0bde 100644 --- a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch index e6197fd8e78..e6197fd8e78 100644 --- a/pkgs/development/tools/build-managers/gnumake/log.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch diff --git a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch index 39ea05843bf..39ea05843bf 100644 --- a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch diff --git a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch index b28c07353ec..b28c07353ec 100644 --- a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch diff --git a/pkgs/development/tools/build-managers/gnumake/oneshell.patch b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch index fbade127ce6..fbade127ce6 100644 --- a/pkgs/development/tools/build-managers/gnumake/oneshell.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch diff --git a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch index a19fe7b7d62..a19fe7b7d62 100644 --- a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch new file mode 100644 index 00000000000..de7e4f61521 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch @@ -0,0 +1,17 @@ +Fixed default libpatttern on Darwin, imported from prefix overlay. +Got merged upstream: +https://savannah.gnu.org/bugs/?37197 +--- default.c.orig 2009-05-02 12:25:24 +0200 ++++ default.c 2009-05-02 12:25:58 +0200 +@@ -509,7 +509,11 @@ + #ifdef __MSDOS__ + ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", + #else ++#ifdef __APPLE__ ++ ".LIBPATTERNS", "lib%.dylib lib%.a", ++#else + ".LIBPATTERNS", "lib%.so lib%.a", ++#endif + #endif + #endif + diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix new file mode 100644 index 00000000000..6a76fa0302b --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl}: + +let version = "4.0"; in +stdenv.mkDerivation { + name = "gnumake-${version}"; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.bz2"; + sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6"; + }; + + /* On Darwin, there are 3 test failures that haven't been investigated + yet. */ + doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; + + patches = + [ + # Purity: don't look for library dependencies (of the form + # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. + # Likewise, when searching for included Makefiles, don't look in + # /usr/include and friends. + ./impure-dirs.patch + + # a bunch of patches from Gentoo, mostly should be from upstream (unreleased) + ./darwin-library_search-dylib.patch + ]; + patchFlags = "-p0"; + + meta = { + description = "GNU Make, a program controlling the generation of non-source files from sources"; + + longDescription = + '' Make is a tool which controls the generation of executables and + other non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file + called the makefile, which lists each of the non-source files and + how to compute it from other files. When you write a program, you + should write a makefile for it, so that it is possible to use Make + to build and install the program. + ''; + + homepage = http://www.gnu.org/software/make/; + + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch new file mode 100644 index 00000000000..f6646f1d012 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch @@ -0,0 +1,34 @@ +diff -rc read.c read.c +*** read.c 2006-03-17 15:24:20.000000000 +0100 +--- read.c 2007-05-24 17:16:31.000000000 +0200 +*************** +*** 99,107 **** +--- 99,109 ---- + #endif + INCLUDEDIR, + #ifndef _AMIGA ++ #if 0 + "/usr/gnu/include", + "/usr/local/include", + "/usr/include", ++ #endif + #endif + 0 + }; +diff -rc reremake.c +*** remake.c 2006-03-20 03:36:37.000000000 +0100 +--- remake.c 2007-05-24 17:06:54.000000000 +0200 +*************** +*** 1452,1460 **** +--- 1452,1462 ---- + static char *dirs[] = + { + #ifndef _AMIGA ++ #if 0 + "/lib", + "/usr/lib", + #endif ++ #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* + * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index 13a216799a2..8f01486cfe7 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cat > $out/bin/sbt << EOF #!/bin/sh SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M" - ${jre}/bin/java $SBT_OPTS -jar ${src} "\$@" + ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@" EOF chmod +x $out/bin/sbt ''; |