diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
| commit | 55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (patch) | |
| tree | b820b7c4b064e5d430439839768aa5b855ce3a4a /acprep | |
| parent | 3f00f8362c2fdfae1dbb6517bc29c75e308bc4f0 (diff) | |
| parent | 60059750061fe59c83adc869f36335a083955608 (diff) | |
| download | fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.gz fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.bz2 fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.zip | |
Merge branch 'next'
Diffstat (limited to 'acprep')
| -rwxr-xr-x | acprep | 26 |
1 files changed, 23 insertions, 3 deletions
@@ -234,7 +234,7 @@ class PrepareBuild(CommandLineApp): type='int', action='store', dest='jobs', default=1, help='Allow N make jobs at once') op.add_option('', '--boost', metavar='SUFFIX', - action="callback", + action="callback", type="string", callback=self.option_boost, help='Set Boost library suffix (ex: "--boost=-mt")') op.add_option('', '--force', action="callback", @@ -751,6 +751,10 @@ class PrepareBuild(CommandLineApp): self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit/include') self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit/lib') + if exists('/usr/local/stow/icu/include'): + self.sys_include_dirs.insert(0, '/usr/local/stow/icu/include') + self.sys_library_dirs.insert(0, '/usr/local/stow/icu/lib') + self.CXXFLAGS.append('-march=nocona') self.CXXFLAGS.append('-msse3') self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1') @@ -979,6 +983,14 @@ class PrepareBuild(CommandLineApp): self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit-debug/include') self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit-debug/lib') + if exists('/usr/local/stow/icu-debug/include'): + if '/usr/local/stow/icu/include' in self.sys_include_dirs: + self.sys_include_dirs.remove('/usr/local/stow/icu/include') + self.sys_library_dirs.remove('/usr/local/stow/icu/lib') + + self.sys_include_dirs.insert(0, '/usr/local/stow/icu-debug/include') + self.sys_library_dirs.insert(0, '/usr/local/stow/icu-debug/lib') + if exists('/opt/local/lib/libboost_regex-d.a'): self.envvars['BOOST_HOME'] = '/opt/local' self.envvars['BOOST_SUFFIX'] = '-d' @@ -995,6 +1007,14 @@ class PrepareBuild(CommandLineApp): self.envvars['BOOST_SUFFIX']) self.sys_include_dirs.append('/usr/local/include/boost-1_40') + + elif exists('/usr/local/lib/libboost_regex-xgcc44-d-1_40.a'): + self.envvars['BOOST_HOME'] = '/usr/local' + self.envvars['BOOST_SUFFIX'] = '-xgcc44-d-1_40' + self.log.info('Setting BOOST_SUFFIX => %s' % + self.envvars['BOOST_SUFFIX']) + + self.sys_include_dirs.append('/usr/local/include/boost-1_40') else: if exists('/opt/local/lib/libboost_regex.a'): self.envvars['BOOST_HOME'] = '/opt/local' @@ -1005,9 +1025,9 @@ class PrepareBuild(CommandLineApp): self.sys_include_dirs.append('/opt/local/include/boost') - elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'): + elif exists('/usr/local/lib/libboost_regex-xgcc44-1_40.a'): self.envvars['BOOST_HOME'] = '/usr/local' - self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40' + self.envvars['BOOST_SUFFIX'] = '-xgcc44-1_40' self.log.info('Setting BOOST_SUFFIX => %s' % self.envvars['BOOST_SUFFIX']) |