Merge pull request #291 from thdox/ubuntu-14.04

Lower down (from 1.55) requirements towards libboost
This commit is contained in:
John Wiegley 2014-05-17 06:45:26 -05:00
commit 35a36f33aa
3 changed files with 13 additions and 15 deletions

View file

@ -114,12 +114,10 @@ If you're going to build on Ubuntu, `sudo apt-get install ...` the
following packages (current as of Ubuntu 14.04): following packages (current as of Ubuntu 14.04):
sudo apt-get install build-essential cmake doxygen sudo apt-get install build-essential cmake doxygen
libboost-system1.55-dev libboost1.55-dev python-dev libboost-system-dev libboost-dev python-dev gettext git
gettext git libboost-date-time1.55-dev libboost-date-time-dev libboost-filesystem-dev
libboost-filesystem1.55-dev libboost-iostreams1.55-dev libboost-iostreams-dev libboost-python-dev libboost-regex-dev
libboost-python1.55-dev libboost-regex1.55-dev libboost-test-dev libedit-dev libgmp3-dev libmpfr-dev texinfo
libboost-test1.55-dev libedit-dev libgmp3-dev
libmpfr-dev texinfo
Or, for Ubuntu 12.04: Or, for Ubuntu 12.04:

16
acprep
View file

@ -72,14 +72,14 @@ class BoostInfo(object):
return [ 'boost-devel' ] return [ 'boost-devel' ]
elif system == 'ubuntu-trusty': elif system == 'ubuntu-trusty':
return [ 'libboost1.55-dev', return [ 'libboost-dev',
'libboost-date-time1.55-dev', 'libboost-date-time-dev',
'libboost-filesystem1.55-dev', 'libboost-filesystem-dev',
'libboost-iostreams1.55-dev', 'libboost-iostreams-dev',
'libboost-python1.55-dev', 'libboost-python-dev',
'libboost-regex1.55-dev', 'libboost-regex-dev',
'libboost-system1.55-dev', 'libboost-system-dev',
'libboost-test1.55-dev' ] 'libboost-test-dev' ]
elif system == 'ubuntu-saucy' or system == 'ubuntu-precise': elif system == 'ubuntu-saucy' or system == 'ubuntu-precise':
return [ 'autopoint', return [ 'autopoint',