diff options
Diffstat (limited to 'pkgs/development/tools/build-managers')
11 files changed, 4 insertions, 504 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 deleted file mode 100644 index ad855df73534..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnumake-3.80"; - - src = fetchurl { - url = http://tarballs.nixos.org/make-3.80.tar.bz2; - sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9"; - }; - - patches = [./log.patch]; - - hardeningDisable = [ "format" ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch deleted file mode 100644 index fa90acfe8de5..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc make-3.80-orig/job.c make-3.80/job.c -*** make-3.80-orig/job.c 2002-08-10 03:27:17.000000000 +0200 ---- make-3.80/job.c 2004-04-02 17:38:04.000000000 +0200 -*************** -*** 987,993 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 987,993 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "\e[3s\e[a%s\e[b" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc make-3.80-orig/main.c make-3.80/main.c -*** make-3.80-orig/main.c 2002-08-10 03:27:17.000000000 +0200 ---- make-3.80/main.c 2004-04-02 17:42:50.000000000 +0200 -*************** -*** 254,259 **** ---- 254,263 ---- - they appear out of date or not. */ - - int always_make_flag = 0; -+ -+ int logNestingStdout = 0; -+ int logNestingStderr = 0; -+ - - /* The usage output. We write it this way to make life easier for the - translators, especially those trying to translate to right-to-left -*************** -*** 827,832 **** ---- 831,845 ---- - } - - -+ static void closeNesting() -+ { -+ while (logNestingStdout--) -+ printf("\e[q"); -+ while (logNestingStderr--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifndef _AMIGA - int - main (argc, argv, envp) -*************** -*** 854,859 **** ---- 867,874 ---- - no_default_sh_exe = 1; - #endif - -+ atexit(closeNesting); -+ - default_goal_file = 0; - reading_file = 0; - -*************** -*** 2782,2787 **** ---- 2797,2808 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering) -+ { -+ printf("\e[p"); -+ logNestingStdout++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 2810,2813 **** ---- 2831,2840 ---- - else - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); -+ -+ if (!entering) -+ { -+ printf("\e[q"); -+ logNestingStdout--; -+ } - } -diff -rc make-3.80-orig/make.h make-3.80/make.h -*** make-3.80-orig/make.h 2002-09-11 18:55:44.000000000 +0200 ---- make-3.80/make.h 2004-04-02 17:42:15.000000000 +0200 -*************** -*** 559,562 **** ---- 559,567 ---- - extern int atomic_stat PARAMS ((const char *file, struct stat *buf)); - extern struct dirent *atomic_readdir PARAMS ((DIR *dir)); - -+ - #endif -+ -+ -+ extern int logNestingStdout; -+ extern int logNestingStderr; -diff -rc make-3.80-orig/remake.c make-3.80/remake.c -*** make-3.80-orig/remake.c 2002-08-08 02:11:19.000000000 +0200 ---- make-3.80/remake.c 2004-04-04 23:10:19.000000000 +0200 -*************** -*** 1049,1055 **** ---- 1049,1059 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->cmds->any_recurse) - { -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ logNestingStderr++; - execute_file_commands (file); -+ fprintf(stderr, "\e[q"); -+ logNestingStderr--; - return; - } - diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index ce5eff878ead..87897017f86a 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation { patches = [ - # Provide nested log output for subsequent pretty-printing by - # nix-log2xml. - ./log.patch - # 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 diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch deleted file mode 100644 index e6197fd8e78f..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc job.c job.c -*** job.c 2006-03-20 04:03:04.000000000 +0100 ---- job.c 2009-01-19 19:37:28.000000000 +0100 -*************** -*** 1083,1089 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 1083,1089 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc main.c main.c -*** main.c 2006-03-20 03:36:37.000000000 +0100 ---- main.c 2009-01-19 19:41:41.000000000 +0100 -*************** -*** 886,891 **** ---- 886,900 ---- - } - - -+ static void close_nesting() -+ { -+ while (stdout_nesting_level--) -+ printf("\e[q"); -+ while (stderr_nesting_level--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifdef _AMIGA - int - main (int argc, char **argv) -*************** -*** 931,936 **** ---- 940,950 ---- - atexit (close_stdout); - #endif - -+ atexit(close_nesting); -+ -+ if (getenv("NIX_INDENT_MAKE")) -+ enable_nested_output = 1; -+ - /* Needed for OS/2 */ - initialize_main(&argc, &argv); - -*************** -*** 3095,3100 **** ---- 3109,3120 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering && enable_nested_output) -+ { -+ printf("\e[p"); -+ stdout_nesting_level++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 3124,3129 **** ---- 3144,3159 ---- - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); - -+ if (!entering && enable_nested_output) -+ { -+ printf("\e[q"); -+ stdout_nesting_level--; -+ } -+ - /* Flush stdout to be sure this comes before any stderr output. */ - fflush (stdout); - } -+ -+ int enable_nested_output = 0; -+ int stdout_nesting_level = 0; -+ int stderr_nesting_level = 0; -diff -rc make.h -*** make.h 2006-02-16 00:54:43.000000000 +0100 ---- make.h 2009-01-19 19:32:03.000000000 +0100 -*************** -*** 609,611 **** ---- 609,614 ---- - - #define ENULLLOOP(_v,_c) do { errno = 0; (_v) = _c; } \ - while((_v)==0 && errno==EINTR) -+ extern int enable_nested_output; -+ extern int stdout_nesting_level; -+ extern int stderr_nesting_level; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2009-01-19 19:39:40.000000000 +0100 -*************** -*** 1120,1126 **** ---- 1120,1137 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->cmds->any_recurse) - { -+ if (enable_nested_output) -+ { -+ log_working_directory (1); -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ stderr_nesting_level++; -+ } - execute_file_commands (file); -+ if (enable_nested_output) -+ { -+ fprintf(stderr, "\e[q"); -+ stderr_nesting_level--; -+ } - return; - } - 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 deleted file mode 100644 index de7e4f615212..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index a4128ac854c7..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{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 = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; - 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 deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix deleted file mode 100644 index 7c45a6c8e674..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl }: - -let - version = "4.1"; -in -stdenv.mkDerivation { - name = "gnumake-${version}"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"; - }; - - patchFlags = "-p0"; - 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 - - # Don't segfault if we can't get a tty name. - ./no-tty-name.patch - ]; - - outputs = [ "out" "doc" ]; - - meta = { - homepage = http://www.gnu.org/software/make/; - description = "A tool to control the generation of non-source files from sources"; - license = stdenv.lib.licenses.gpl3Plus; - - 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. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/4.1/no-tty-name.patch b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch deleted file mode 100644 index a84d7ab49d04..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 -From: Paul Smith <psmith@gnu.org> -Date: Mon, 20 Oct 2014 05:54:56 +0000 -Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). - ---- -diff --git main.c main.c -index b2d169c..0cdb8a8 100644 ---- main.c -+++ main.c -@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) - #ifdef HAVE_ISATTY - if (isatty (fileno (stdout))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) -- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), -- o_default, 0)->export = v_export; -- -+ { -+ const char *tty = TTYNAME (fileno (stdout)); -+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - if (isatty (fileno (stderr))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) -- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), -- o_default, 0)->export = v_export; -+ { -+ const char *tty = TTYNAME (fileno (stderr)); -+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - #endif - - /* Reset in case the switches changed our minds. */ -diff --git makeint.h makeint.h -index 6223936..2009f41 100644 ---- makeint.h -+++ makeint.h -@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; - /* The number of bytes needed to represent the largest integer as a string. */ - #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") - -+#define DEFAULT_TTYNAME "true" - #ifdef HAVE_TTYNAME - # define TTYNAME(_f) ttyname (_f) - #else --# define TTYNAME(_f) "true" -+# define TTYNAME(_f) DEFAULT_TTYNAME - #endif - - --- -cgit v0.9.0.2 diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index c0d152ee7a2f..7314643530e8 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc ]; + preConfigure = '' + unset AR + ''; + buildPhase = '' make jam0 ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install |