[cig-commits] commit: Adding a flag to help reduce the number of

[Mercurial]

changeset:   18:8e635ea1f8ed
user:        LukeHodkinson
date:        Thu Aug 14 07:29:19 2008 +0000
files:       SConfig/Package.py SConfig/Platform.py SConfig/packages/dl.py
description:
Adding a flag to help reduce the number of
package candidates on systems with duplicate
library directories.


diff -r cdc05e3dd403 -r 8e635ea1f8ed SConfig/Package.py
--- a/SConfig/Package.py	Mon Aug 11 11:14:22 2008 +0000
+++ b/SConfig/Package.py	Thu Aug 14 07:29:19 2008 +0000
@@ -121,7 +121,7 @@ class Package(SConfig.Node):
         if self.platform.system in ['Darwin', '*ix']:
             self.base_dirs = ['/usr', '/usr/local']
             self.sub_dirs = [[['include'], ['lib']]]
-            if self.platform.bits == 64:
+            if self.platform.bits == 64 and self.env['with_lib64']:
                 self.sub_dirs = [[['include'], ['lib64']],
                                  [['include'], [os.path.join('lib', '64')]]] + self.sub_dirs
 
diff -r cdc05e3dd403 -r 8e635ea1f8ed SConfig/Platform.py
--- a/SConfig/Platform.py	Mon Aug 11 11:14:22 2008 +0000
+++ b/SConfig/Platform.py	Thu Aug 14 07:29:19 2008 +0000
@@ -20,6 +20,7 @@ class Platform(SConfig.Node):
         self.opts.AddOptions(
             SCons.Script.BoolOption('with_32bit', 'Generate 32bit code', 0),
             SCons.Script.BoolOption('with_64bit', 'Generate 64bit code', 0),
+            SCons.Script.BoolOption('with_lib64', 'Search in lib64 directories', 1),
             )
 
     def check_system(self):
diff -r cdc05e3dd403 -r 8e635ea1f8ed SConfig/packages/dl.py
--- a/SConfig/packages/dl.py	Mon Aug 11 11:14:22 2008 +0000
+++ b/SConfig/packages/dl.py	Thu Aug 14 07:29:19 2008 +0000
@@ -7,3 +7,5 @@ class dl(SConfig.Package):
         self.dependency(SConfig.packages.CompilerFlags)
         self.headers = [['dlfcn.h']]
         self.libraries = [['dl']]
+        self.symbols = [(['dlopen'], '')]
+        self.symbol_calls = ['%s("dummy", RTLD_LAZY);']