Author: shlevy
Date: Thu Mar 31 21:25:08 2011
New Revision: 26635
URL: https://svn.nixos.org/websvn/nix/?rev=26635&sc=1
Log:
Add CLooG, an alternative to CLooG-PPL based on the integer set library, an
optional dependency for GCC 4.6.0
Added:
nixpkgs/trunk/pkgs/development/libraries/cloog/
- copied from r26631, nixpkgs/trunk/pkgs/development/libraries/cloog-ppl/
Modified:
nixpkgs/trunk/pkgs/development/libraries/cloog/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/cloog/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/cloog-ppl/default.nix Thu Mar
31 21:08:50 2011 (r26631)
+++ nixpkgs/trunk/pkgs/development/libraries/cloog/default.nix Thu Mar 31
21:25:08 2011 (r26635)
@@ -1,37 +1,36 @@
-{ fetchurl, stdenv, ppl, static ? false }:
+{ fetchurl, stdenv, gmp, isl, static ? false }:
let
-
- # --with-host-libstdcxx helps when *ppl* is built statically.
- # But I will suppose that this is statically built only when ppl is also
- # statically built.
staticFlags =
- assert static -> ppl.dontDisableStatic == true;
- if static then " --enable-static --disable-shared
--with-host-libstdcxx=-lstdc++" else "";
-
+ assert static -> isl.dontDisableStatic == true;
+ if static then "--enable-static --disable-shared" else "";
+
in
stdenv.mkDerivation rec {
- name = "cloog-ppl-0.15.9";
+ name = "cloog-0.16.2";
src = fetchurl {
- url = "mirror://gcc/infrastructure/${name}.tar.gz";
- sha256 = "19a2n75k3d3n8llng25f2g88lpvd4zn0lm073rkndjw6l6yd8m4c";
+ url =
"http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";;
+ sha256 = "1w9n9lsq18k65fywwbbvhkgl917053w1kvqw0xhlwcma0v59m6mx";
};
- propagatedBuildInputs = [ ppl ];
+ buildInputs = [ gmp ];
- configureFlags = "--with-ppl=${ppl}" + staticFlags;
+ propagatedBuildInputs = [ isl ];
+
+ configureFlags = "--with-isl=system --with-isl-prefix=${isl}" + staticFlags;
+
dontDisableStatic = if static then true else false;
crossAttrs = {
- configureFlags = "--with-ppl=${ppl.hostDrv}" + staticFlags;
+ configureFlags = "--with-isl=system --with-isl-prefix=${isl.hostDrv}" +
staticFlags;
};
doCheck = true;
meta = {
- description = "CLooG-PPL, the Chunky Loop Generator";
+ description = "CLooG, the Chunky Loop Generator";
longDescription = ''
CLooG is a free software library to generate code for scanning
@@ -47,12 +46,11 @@
effective code.
'';
- # CLooG-PPL is actually a port of GLooG from PolyLib to PPL.
homepage = http://www.cloog.org/;
license = "GPLv2+";
- maintainers = [ stdenv.lib.maintainers.ludo ];
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
/* Leads to an ICE on Cygwin:
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 31 21:21:55
2011 (r26634)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 31 21:25:08
2011 (r26635)
@@ -489,6 +489,8 @@
usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
+ cloog = callPackage ../development/libraries/cloog { };
+
cloogppl = callPackage ../development/libraries/cloog-ppl { };
convmv = callPackage ../tools/misc/convmv { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
