From 1f9e87871ea9f9db2c05ce1e9a59a101d5beb2fe Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 18 Nov 2009 13:41:17 +0000
Subject: GNU Guile 1.9: Remove unnecessary patch.

svn path=/nixpkgs/trunk/; revision=18418
---
 pkgs/development/interpreters/guile/1.9.nix        |  4 +--
 .../interpreters/guile/gcov-file-name.patch        | 42 ----------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/interpreters/guile/gcov-file-name.patch

(limited to 'pkgs/development/interpreters/guile')

diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix
index 5f5ae8d9e819..253b299af392 100644
--- a/pkgs/development/interpreters/guile/1.9.nix
+++ b/pkgs/development/interpreters/guile/1.9.nix
@@ -19,8 +19,8 @@ rec {
   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"
diff --git a/pkgs/development/interpreters/guile/gcov-file-name.patch b/pkgs/development/interpreters/guile/gcov-file-name.patch
deleted file mode 100644
index f144296170ed..000000000000
--- a/pkgs/development/interpreters/guile/gcov-file-name.patch
+++ /dev/null
@@ -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();
- 
-- 
cgit 1.4.1