Mercurial > gub

changeset 3167:dc91a6c1dde0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
apply reloc patch only once
author Han-Wen Nienhuys <hanwen@lilypond.org>
date Sat, 07 Apr 2007 00:19:38 -0300
parents 4dfdd768340f
children 6d8dab189977
files specs/guile.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/specs/guile.py	Fri Apr 06 20:19:38 2007 -0300
+++ b/specs/guile.py	Sat Apr 07 00:19:38 2007 -0300
@@ -1,3 +1,4 @@
+import re
 import os
 #
 import download
@@ -30,7 +31,7 @@
         
     def license_file (self):
         return '%(srcdir)s/COPYING.LIB' 
-
+ 
     def get_subpackage_names (self):
         return ['doc', 'devel', 'runtime', '']
 
@@ -55,7 +56,10 @@
 
     def patch (self):
         self.autogen_sh()
-        self.system ('cd %(srcdir)s && patch -p0 < %(patchdir)s/guile-reloc.patch')
+
+        ## Don't apply patch twice.
+        if None == re.search ('reloc_p=', open (self.expand ('%(srcdir)s/configure.in')).read()):
+            self.system ('cd %(srcdir)s && patch -p0 < %(patchdir)s/guile-reloc.patch')
         self.autoupdate ()
 
     def configure_flags (self):