Mercurial > gub

changeset 2994:a462b5c36c75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
override target for zlib; fixes linux64 compile on darwin
author hanwen <hanwen@xs4all.nl>
date Fri, 22 Dec 2006 11:16:58 +0100
parents 48d185a52bb5
children 2764f862dc0d
files specs/zlib.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/specs/zlib.py	Thu Dec 21 01:20:06 2006 +0100
+++ b/specs/zlib.py	Fri Dec 22 11:16:58 2006 +0100
@@ -2,6 +2,7 @@
 import targetpackage
 import gub
 import toolpackage
+import re
 
 class Zlib (targetpackage.TargetBuildSpec):
     def __init__ (self, settings):
@@ -18,9 +19,13 @@
 
     def compile_command (self):
         return targetpackage.TargetBuildSpec.compile_command (self) + ' ARFLAGS=r '
+
     
     def configure_command (self):
-        zlib_is_broken = 'SHAREDTARGET=libz.so.1.2.2'
+        stripped_platform = self.settings.expand ('%(platform)s')
+        stripped_platform = re.sub ('-.*', '', stripped_platform)
+        
+        zlib_is_broken = 'SHAREDTARGET=libz.so.1.2.2 target=' + stripped_platform
 
         ## doesn't use autoconf configure.
         return zlib_is_broken + ' %(srcdir)s/configure --shared '