summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-12 16:35:31 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-12 16:39:29 (GMT)
commit40499c9dffdc1ac676f66ae51ba42513a726f1cb (patch)
tree168b79e9c4868308830365bdbd4ab165a43d82ed
parent710cf2f8f1941fa8beb9f7d92e3de03fee9265e3 (diff)
downloadswift-40499c9dffdc1ac676f66ae51ba42513a726f1cb.zip
swift-40499c9dffdc1ac676f66ae51ba42513a726f1cb.tar.bz2
Fix Boost detection in Ubuntu 9.10.
-rw-r--r--BuildTools/SCons/SConstruct12
-rw-r--r--Swift/Packaging/Debian/debian/control2
2 files changed, 11 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 3a41be4..c3ad8d1 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -267,16 +267,24 @@ else :
# Boost
boostLibs = [("signals", None), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("system", "system/system_error.hpp"), ("date_time", "date_time/date.hpp")]
allLibsPresent = True
+libNames = []
for (lib, header) in boostLibs :
if header :
header = "boost/" + header
else :
header = "boost/" + lib + ".hpp"
- if not conf.CheckCXXHeader(header) or not conf.CheckLib("boost_" + lib) :
+ if not conf.CheckCXXHeader(header) :
allLibsPresent = False
break
+ libName = "boost_" + lib
+ if not conf.CheckLib(libName) :
+ libName += "-mt"
+ if not conf.CheckLib(libName) :
+ allLibsPresent = False
+ break
+ libNames.append(libName)
if allLibsPresent :
- env["BOOST_FLAGS"] = { "LIBS": ["boost_" + lib for lib, header in boostLibs] }
+ env["BOOST_FLAGS"] = { "LIBS": libNames }
if not conf.CheckCXXHeader("boost/uuid/uuid.hpp") :
# FIXME: Remove this workaround when UUID is available in most distros
env["BOOST_BUNDLED_UUID_ONLY"] = True
diff --git a/Swift/Packaging/Debian/debian/control b/Swift/Packaging/Debian/debian/control
index 217c4e7..97a5832 100644
--- a/Swift/Packaging/Debian/debian/control
+++ b/Swift/Packaging/Debian/debian/control
@@ -2,7 +2,7 @@ Source: swift
Section: x11
Priority: optional
Maintainer: Remko Tronçon <dev@el-tramo.be>
-Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libexpat1-dev (>= 2.0.1), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10)
+Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libexpat1-dev (>= 2.0.1), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1) | libboost1.38-dev, libboost-filesystem-dev (>= 1.34.1) | libboost-filesystem1.38-dev, libboost-program-options-dev (>= 1.34.1) | libboost-program-options1.38-dev, libboost-regex-dev (>= 1.34.1) | libboost-regex1.38-dev, libboost-signals-dev (>= 1.34.1) | libboost-signals1.38-dev, libboost-system-dev (>= 1.34.1) | libboost-system1.38-dev, libboost-thread-dev (>= 1.34.1) | libboost-thread1.38-dev, libboost-date-time-dev (>= 1.34.1) | libboost-date-time1.38-dev, libidn11-dev (>= 1.10)
Standards-Version: 3.8.4
Homepage: http://swift.im