sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next'

Browse source
This commit is contained in:
John Wiegley 2009-10-31 05:47:05 -04:00
commit faaafdd3ef
1 changed files with 11 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
acprep
View file

@ -743,6 +743,7 @@ class PrepareBuild(CommandLineApp):
self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1') self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1')
self.options.use_glibcxx_debug = True self.options.use_glibcxx_debug = True
self.locate_my_libraries()
def setup_for_system(self): def setup_for_system(self):
self.setup_system_directories() self.setup_system_directories()
@ -949,30 +950,7 @@ class PrepareBuild(CommandLineApp):
# The various build flavors # # The various build flavors #
######################################################################### #########################################################################
def setup_flavor_default(self): def locate_my_libraries(self):
if exists('/opt/local/lib/libboost_regex.a'):
self.envvars['BOOST_HOME'] = '/opt/local'
self.envvars['BOOST_SUFFIX'] = ''
self.log.info('Setting BOOST_SUFFIX => %s' %
self.envvars['BOOST_SUFFIX'])
self.sys_include_dirs.append('/opt/local/include/boost')
elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
self.envvars['BOOST_HOME'] = '/usr/local'
self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
self.log.info('Setting BOOST_SUFFIX => %s' %
self.envvars['BOOST_SUFFIX'])
self.sys_include_dirs.append('/usr/local/include/boost-1_40')
def setup_flavor_debug(self):
self.configure_args.append('--enable-debug')
self.CXXFLAGS.append('-g')
self.LDFLAGS.append('-g')
if self.options.use_glibcxx_debug: if self.options.use_glibcxx_debug:
self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags') self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags')
@ -1020,27 +998,19 @@ class PrepareBuild(CommandLineApp):
self.sys_include_dirs.append('/usr/local/include/boost-1_40') self.sys_include_dirs.append('/usr/local/include/boost-1_40')
def setup_flavor_default(self):
pass
def setup_flavor_debug(self):
self.configure_args.append('--enable-debug')
self.CXXFLAGS.append('-g')
self.LDFLAGS.append('-g')
def setup_flavor_opt(self): def setup_flavor_opt(self):
self.CXXFLAGS.append('-O3') self.CXXFLAGS.append('-O3')
self.CXXFLAGS.append('-fomit-frame-pointer') self.CXXFLAGS.append('-fomit-frame-pointer')
if exists('/opt/local/lib/libboost_regex.a'):
self.envvars['BOOST_HOME'] = '/opt/local'
self.envvars['BOOST_SUFFIX'] = ''
self.log.info('Setting BOOST_SUFFIX => %s' %
self.envvars['BOOST_SUFFIX'])
self.sys_include_dirs.append('/opt/local/include/boost')
elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
self.envvars['BOOST_HOME'] = '/usr/local'
self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
self.log.info('Setting BOOST_SUFFIX => %s' %
self.envvars['BOOST_SUFFIX'])
self.sys_include_dirs.append('/usr/local/include/boost-1_40')
def setup_flavor_gcov(self): def setup_flavor_gcov(self):
self.CXXFLAGS.append('-g') self.CXXFLAGS.append('-g')
self.CXXFLAGS.append('-fprofile-arcs') self.CXXFLAGS.append('-fprofile-arcs')