Changeset 1224

Timestamp:

07/08/09 17:08:13 (14 months ago)

Author:

dane

Message:

scons: when auto-finding boost libraries take the shortest boost library name found to avoid problems with variable extension naming on linux (TODO add better regex approach)

Files:

• trunk/SConstruct (modified) (2 diffs)

trunk/SConstruct

@@ -61 +61 @@
     else:
         color_print(1,'Problem encounted with SCons scripts, please post bug report to: http://trac.mapnik.org\nError was: %s' % stderr)
+
+def shortest_name(libs):
+    name = '-'*200
+    for lib in libs:
+        if len(name) > len(lib):
+            name = lib
+    return name
 
 if platform.uname()[4] == 'x86_64':
@@ -375 +382 @@
             BOOST_LIB_DIR = os.path.dirname(libItems[0])
             BOOST_INCLUDE_DIR = incItems[0].rstrip('boost/')
-            match = re.search(r'libboost_filesystem-(.*)\..*', libItems[0])
+            shortest_lib_name = shortest_name(libItems)
+            match = re.search(r'libboost_filesystem-(.*)\..*', shortest_lib_name)
             if hasattr(match,'groups'):
                 BOOST_APPEND = match.groups()[0]