From aa58b5f571cd4e501f90181b9cf624fb96dd270c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 16:09:33 +0100 Subject: [PATCH] gnumake: clean up directory structure; no functional change --- .../3.80}/default.nix | 0 .../{gnumake-3.80 => gnumake/3.80}/log.patch | 0 .../gnumake/{3.81.nix => 3.81/default.nix} | 0 .../gnumake/{ => 3.81}/impure-dirs.patch | 0 .../gnumake/{ => 3.81}/log-3.81.patch | 0 .../gnumake/{ => 3.82}/MAKEFLAGS-reexec.patch | 0 .../{ => 3.82}/archives-many-objs.patch | 0 .../{ => 3.82}/construct-command-line.patch | 0 .../gnumake/{ => 3.82}/copy-on-expand.patch | 0 .../darwin-library_search-dylib.patch | 0 .../gnumake/{ => 3.82}/default.nix | 0 .../gnumake/{ => 3.82}/glob-speedup.patch | 0 .../gnumake/3.82/impure-dirs.patch | 34 +++++++++++++++++++ .../{ => 3.82}/intermediate-parallel.patch | 0 .../gnumake/{ => 3.82}/log.patch | 0 .../{ => 3.82}/long-command-line.patch | 0 .../{ => 3.82}/memory-corruption.patch | 0 .../gnumake/{ => 3.82}/oneshell.patch | 0 .../gnumake/{ => 3.82}/parallel-remake.patch | 0 pkgs/top-level/all-packages.nix | 8 ++--- 20 files changed, 38 insertions(+), 4 deletions(-) rename pkgs/development/tools/build-managers/{gnumake-3.80 => gnumake/3.80}/default.nix (100%) rename pkgs/development/tools/build-managers/{gnumake-3.80 => gnumake/3.80}/log.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{3.81.nix => 3.81/default.nix} (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.81}/impure-dirs.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.81}/log-3.81.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/MAKEFLAGS-reexec.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/archives-many-objs.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/construct-command-line.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/copy-on-expand.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/darwin-library_search-dylib.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/default.nix (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/glob-speedup.patch (100%) create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/intermediate-parallel.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/log.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/long-command-line.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/memory-corruption.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/oneshell.patch (100%) rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/parallel-remake.patch (100%) diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix similarity index 100% rename from pkgs/development/tools/build-managers/gnumake-3.80/default.nix rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake-3.80/log.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/3.81.nix rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/impure-dirs.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/log-3.81.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/construct-command-line.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/default.nix rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/glob-speedup.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/log.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/long-command-line.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/memory-corruption.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/oneshell.patch rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/parallel-remake.patch rename to pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db76a4e5506..3bffbc5f260 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3641,10 +3641,10 @@ let gnum4 = callPackage ../development/tools/misc/gnum4 { }; - gnumake = callPackage ../development/tools/build-managers/gnumake { }; - - gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { }; - gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { }; + gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; + gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; + gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; + gnumake = gnumake382; gob2 = callPackage ../development/tools/misc/gob2 { };