Author: MarcWeber Date: 2010-06-19 15:52:28 +0000 (Sat, 19 Jun 2010) New Revision: 22336
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22336&view=rev Removed: nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/num-cores.patch Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix Log: reverting my patch series adding -j -l support for make Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -6,8 +6,6 @@ url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz; md5 = "7218e778b5970a86c958e597f952f193"; }; - - NO_PARALLEL_BUILD_buildPhase = 1; patches = [./fix.patch]; Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -74,6 +74,4 @@ maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; - - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -14,6 +14,4 @@ wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \ ''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH} \ ''; - - NO_PARALLEL_BUILD_buildPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -55,8 +55,6 @@ inherit zlib; - NUM_CORES = 1; - buildPhase = '' set -x mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -70,7 +70,4 @@ # TODO make them optional and make them work patches = [ ./disable-modules.patch ]; - - NUM_CORES = 1; - }) Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -7,7 +7,6 @@ url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz; md5 = "c6ef478362295c150101cdd2efcd38e0"; }; - NUM_CORES = 1; # both fail: build and install configureScript = ./configure-3.08.0; dontAddPrefix = "True"; configureFlags = ["-no-tk" "-x11lib" x11]; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -7,7 +7,6 @@ url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz; md5 = "c73f4b093e27ba5bf13d62923f89befc"; }; - NUM_CORES = 1; # both fail: build and install configureScript = ./configure-3.09.1; dontAddPrefix = "True"; configureFlags = ["-no-tk" "-x11lib" x11]; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -9,8 +9,6 @@ sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; - NUM_CORES = 1; # both fail: build and install - prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -14,8 +14,6 @@ sha256 = "8c36a28106d4b683a15c547dfe4cb757a53fa9247579d1cc25bd06a22cc62e50"; }; - NUM_CORES = 1; # both fail: build and install - prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { name = "${baseName}-${v}"; - NO_PARALLEL_BUILD_buildPhase = 1; - buildInputs = [ flex bison glib pkgconfig python cairo ]; propagatedBuildInputs = [ libffi ]; configureFlags = "--enable-gcov"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -19,8 +19,6 @@ buildInputs = [nspr perl zlib]; - NO_PARALLEL_BUILD_buildPhase = 1; - # Based on the build instructions at # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -14,8 +14,6 @@ sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; }; - NO_PARALLEL_BUILD_buildPhase = 1; - buildNativeInputs = [ perl ]; configureScript = "./config"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -14,8 +14,6 @@ sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh"; }; - NO_PARALLEL_BUILD_buildPhase = 1; - buildNativeInputs = [ perl ]; configureScript = "./config"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -11,7 +11,4 @@ description = "The GNU Portable Threads"; homepage = http://www.gnu.org/software/pth; }; - - NO_PARALLEL_BUILD_buildPhase = 1; - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -14,5 +14,4 @@ ''; configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; buildInputs = [ncurses pcre libpng zlib readline]; - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -17,5 +17,4 @@ meta = { description = "A fast lexical analyser generator"; }; - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -16,5 +16,4 @@ meta = { description = "A fast lexical analyser generator"; }; - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -16,5 +16,4 @@ meta = { description = "A fast lexical analyser generator"; }; - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -9,5 +9,4 @@ md5 = "bd8753d0b22e1f4ec87a553a73021adf"; }; buildInputs = [yacc]; - NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh 2010-06-19 15:52:28 UTC (rev 22336) @@ -73,27 +73,8 @@ addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" } -cmd(){ - echo "cmd: $@" - "$@" -} -runMake(){ - local optout=NO_PARALLEL_BUILD_${curPhase} - [ -n "${!optout}" ] || \ - local j="$makeFlagsParallelBuild" - cmd make ${makefile:+-f $makefile} "$@" $j -} - ###################################################################### -# parallel builds: opt-out -# - in a phase: set NO_PARALLEL_BUILD_${PHASE_NAME} -# - for this build: pass NUM_CORES=1 to the builder -if [ "$NUM_CORES" != 1 ]; then - makeFlagsParallelBuild="-j ${NIX_MAX_PARALLELIZATION:-1} ${NIX_TARGET_LOAD:+-l} $NIX_TARGET_LOAD" -fi - -###################################################################### # Initialisation. set -e @@ -620,7 +601,9 @@ return fi - runMake $makeFlags "${makeflagsarr...@]}" \ + echo "make flags: $makeFlags ${makeflagsarr...@]} $buildFlags ${buildflagsarr...@]}" + make ${makefile:+-f $makefile} \ + $makeFlags "${makeflagsarr...@]}" \ $buildFlags "${buildflagsarr...@]}" runHook postBuild @@ -630,7 +613,9 @@ checkPhase() { runHook preCheck - runMake $makeFlags "${makeflagsarr...@]}" \ + echo "check flags: $makeFlags ${makeflagsarr...@]} $checkFlags ${checkflagsarr...@]}" + make ${makefile:+-f $makefile} \ + $makeFlags "${makeflagsarr...@]}" \ $checkFlags "${checkflagsarr...@]}" ${checkTarget:-check} runHook postCheck @@ -678,7 +663,8 @@ ensureDir "$prefix" installTargets=${installTargets:-install} - runMake $installTargets \ + echo "install flags: $installTargets $makeFlags ${makeflagsarr...@]} $installFlags ${installflagsarr...@]}" + make ${makefile:+-f $makefile} $installTargets \ $makeFlags "${makeflagsarr...@]}" \ $installFlags "${installflagsarr...@]}" @@ -754,7 +740,8 @@ distPhase() { runHook preDist - runMake $distFlags "${distflagsarr...@]}" ${distTarget:-dist} + echo "dist flags: $distFlags ${distflagsarr...@]}" + make ${makefile:+-f $makefile} $distFlags "${distflagsarr...@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then ensureDir "$out/tarballs" Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -17,6 +17,4 @@ platforms = args.lib.platforms.linux; }; - NUM_CORES = 1; - } Deleted: nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/num-cores.patch =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/num-cores.patch 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/num-cores.patch 2010-06-19 15:52:28 UTC (rev 22336) @@ -1,31 +0,0 @@ -commit b77e3721f19b4e5084125eb8dc7186117004dd4b -Author: Marc Weber <[email protected]> -Date: Sun Jun 13 23:53:46 2010 +0200 - - generic/setup.sh: add -j (+1) -l (*2) options to make depending on $NUM_CORES - -diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh -index a9f4d4d..685c0ec 100644 ---- a/pkgs/stdenv/generic/setup.sh -+++ b/pkgs/stdenv/generic/setup.sh -@@ -79,9 +79,19 @@ cmd(){ - } - - runMake(){ -- cmd make ${makefile:+-f $makefile} "$@" -+ local optout=NO_PARALLEL_BUILD_${curPhase} -+ [ -n "${!optout}" ] || \ -+ local j="$makeFlagsParallelBuild" -+ cmd make ${makefile:+-f $makefile} "$@" $j - } - -+###################################################################### -+# parallel builds: opt-out -+# - in a phase: set NO_PARALLEL_BUILD_${PHASE_NAME} -+# - for this build: pass NUM_CORES=1 to the builder -+if [ "$NUM_CORES" -gt 1 ]; then -+ makeFlagsParallelBuild="-j $(( $NUM_CORES + 1 )) -l $(( 2 * $NUM_CORES ))" -+fi - - ###################################################################### - # Initialisation. Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -40,6 +40,4 @@ homepage = http://nixos.org/; license = "LGPLv2+"; }; - - patches = [ ./num-cores.patch ]; } Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix 2010-06-19 15:42:05 UTC (rev 22335) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix 2010-06-19 15:52:28 UTC (rev 22336) @@ -2858,7 +2858,6 @@ }; XMLSAX = buildPerlPackage { - NUM_CORES=1; name = "XML-SAX-0.96"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
