public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk. I had to do two manual merges, quite trivial I think.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
This commit is contained in:
Lluís Batlle i Rossell
2009-11-19 19:09:10 +00:00
parent 7ade207f6b 58f543f19f
commit e85500987b
119 changed files with 1750 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/guile/1.9.nix
View File

@@ -7,18 +7,20 @@
else stdenv.mkDerivation)
rec {
name = "guile-1.9.4"; # This is an alpha release!
name = "guile-1.9.5"; # This is an alpha release!
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz";
sha256 = "1p136fb0s46q1cycfsnd7nny14ji43xva58cz39szvq36p9kjbbg";
sha256 = "0plzdpm22fk2n5m1pjjlckfvksy13aj7n45lx1nw4334i87d6sll";
};
/* 1.9.5 has funny directory names, which contain "GNU Guile"! */
buildInputs = [ makeWrapper gawk readline libtool libunistring pkgconfig ];
propagatedBuildInputs = [ gmp boehmgc ];
patches =
stdenv.lib.optionals (coverageAnalysis != null)
[ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
stdenv.lib.optional (coverageAnalysis != null)
./disable-gc-sensitive-tests.patch;
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"

42
pkgs/development/interpreters/guile/gcov-file-name.patch
View File

@@ -1,42 +0,0 @@
This patch arranges so that we don't end up, with profiling builds, with a
file named `<stdout>.gcov' since that confuses lcov:
<stdout>:cannot open source file
geninfo: ERROR: cannot read <stdout>.gcov!
--- guile/libguile/c-tokenize.c 2009-09-13 13:05:15.000000000 +0200
+++ guile/libguile/c-tokenize.c 2009-10-28 16:24:15.000000000 +0100
@@ -1,5 +1,5 @@
-#line 3 "<stdout>"
+#line 3 "c-tokenize.c"
#define YY_INT_ALIGNED short int
@@ -616,7 +616,7 @@ int cookie_was_last = 0;
#define IS_COOKIE cookie_was_last = 1
#define IS_NOT_COOKIE cookie_was_last = 0
-#line 620 "<stdout>"
+#line 620 "c-tokenize.c"
#define INITIAL 0
@@ -799,7 +799,7 @@ YY_DECL
#line 65 "./c-tokenize.lex"
-#line 803 "<stdout>"
+#line 803 "c-tokenize.c"
if ( !(yy_init) )
{
@@ -1235,7 +1235,7 @@ YY_RULE_SETUP
#line 181 "./c-tokenize.lex"
ECHO;
YY_BREAK
-#line 1239 "<stdout>"
+#line 1239 "c-tokenize.c"
case YY_STATE_EOF(INITIAL):
yyterminate();