diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
| commit | 9183f21f7e005b9229b615e65fa463733267ce96 (patch) | |
| tree | 9155247a14d60982c3f4be514e386a976f7240d3 /pkgs/development/interpreters/guile | |
| parent | c161cd1773e6411054047b1dd2a9544b0b05b0d1 (diff) | |
| parent | c63858a16919de0f929d8377ce616e93a99f2074 (diff) | |
| download | nixlib-9183f21f7e005b9229b615e65fa463733267ce96.tar nixlib-9183f21f7e005b9229b615e65fa463733267ce96.tar.gz nixlib-9183f21f7e005b9229b615e65fa463733267ce96.tar.bz2 nixlib-9183f21f7e005b9229b615e65fa463733267ce96.tar.lz nixlib-9183f21f7e005b9229b615e65fa463733267ce96.tar.xz nixlib-9183f21f7e005b9229b615e65fa463733267ce96.tar.zst nixlib-9183f21f7e005b9229b615e65fa463733267ce96.zip | |
Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/1.9.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/gcov-file-name.patch | 42 |
2 files changed, 44 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix index 1dd3d495339e..27e412484056 100644 --- a/pkgs/development/interpreters/guile/1.9.nix +++ b/pkgs/development/interpreters/guile/1.9.nix @@ -17,8 +17,8 @@ rec { propagatedBuildInputs = [ gmp boehmgc ]; patches = - stdenv.lib.optional (coverageAnalysis != null) - ./disable-gc-sensitive-tests.patch; + stdenv.lib.optionals (coverageAnalysis != null) + [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ]; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" diff --git a/pkgs/development/interpreters/guile/gcov-file-name.patch b/pkgs/development/interpreters/guile/gcov-file-name.patch new file mode 100644 index 000000000000..f144296170ed --- /dev/null +++ b/pkgs/development/interpreters/guile/gcov-file-name.patch @@ -0,0 +1,42 @@ +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(); + |