diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-01-06 08:43:42 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-01-06 08:43:42 +0000 |
| commit | 07393ba7f030999c6ae069ab08e698517428f42b (patch) | |
| tree | ba49aa335e715a8bd5beb4170268fc0bf19282fc /pkgs/development/interpreters/guile | |
| parent | 084a06728838fe32925234e0e87b7762143cae4c (diff) | |
| download | nixlib-07393ba7f030999c6ae069ab08e698517428f42b.tar nixlib-07393ba7f030999c6ae069ab08e698517428f42b.tar.gz nixlib-07393ba7f030999c6ae069ab08e698517428f42b.tar.bz2 nixlib-07393ba7f030999c6ae069ab08e698517428f42b.tar.lz nixlib-07393ba7f030999c6ae069ab08e698517428f42b.tar.xz nixlib-07393ba7f030999c6ae069ab08e698517428f42b.tar.zst nixlib-07393ba7f030999c6ae069ab08e698517428f42b.zip | |
GNU Guile 1.9: Reinstate gcov workaround.
Reverts r18418. svn path=/nixpkgs/trunk/; revision=19254
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(); + |