Author: viric Date: 2010-06-12 20:54:35 +0000 (Sat, 12 Jun 2010) New Revision: 22235
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22235&view=rev Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Cleaning a bit what I commited about llvm, and making dragonegg build. If passing to gcc4.5 the compile flag: "-fplugin=dragonegg.so" it will use the llvm optimizers and code generators. In that previous commit I enabled link time optimization and plugin support in gcc 4.5.0 Changes: Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix 2010-06-12 17:42:33 UTC (rev 22234) +++ nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix 2010-06-12 20:54:35 UTC (rev 22235) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gcc, flex, perl, libtool, groff }: +{stdenv, fetchurl, gcc, flex, perl, libtool, groff}: stdenv.mkDerivation { name = "llvm-2.7"; @@ -8,4 +8,11 @@ }; buildInputs = [ gcc flex perl libtool groff ]; + + meta = { + homepage = http://llvm.org/; + description = "Collection of modular and reusable compiler and toolchain technologies"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; } Modified: nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix 2010-06-12 17:42:33 UTC (rev 22234) +++ nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix 2010-06-12 20:54:35 UTC (rev 22235) @@ -1,15 +1,29 @@ -{stdenv, fetchsvn, llvm}: +{stdenv, fetchsvn, llvm, gmp, mpfr, mpc}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "dragonegg-2.7"; - GCC = "gcc"; - - buildInputs = [ llvm ]; - src = fetchsvn { url = http://llvm.org/svn/llvm-project/dragonegg/branches/release_27; rev = 105882; sha256 = "0j0mj3zm1nd8kaj3b28b3w2dlzc1xbywq4mcdxk5nq4yds6rx5np"; }; + + # The gcc the plugin will be built for (the same used building dragonegg) + GCC = "gcc"; + + buildInputs = [ llvm gmp mpfr mpc ]; + + installPhase = '' + ensureDir $out/lib $out/share/doc/${name} + cp -d dragonegg.so $out/lib + cp README COPYING $out/share/doc/${name} + ''; + + meta = { + homepage = http://dragonegg.llvm.org/; + description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-12 17:42:33 UTC (rev 22234) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-12 20:54:35 UTC (rev 22235) @@ -3710,7 +3710,7 @@ }; dragonegg = import ../development/libraries/dragonegg { - inherit fetchsvn llvm; + inherit fetchsvn llvm gmp mpfr mpc; stdenv = overrideGCC stdenv gcc45; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
