From 4b6e051adbc5615e4099e9d4e69d7341b9c4dc8d Mon Sep 17 00:00:00 2001 From: thdox Date: Sun, 11 May 2014 17:13:09 +0200 Subject: [PATCH 1/2] Ubuntu 14.04 compilation help update: - add patch from Hans Erik van Elburg posted on mailing-list on 9-May-2014 - add also some documentation in README files --- README-1ST | 5 +++-- README.md | 19 +++++++++++-------- acprep | 31 ++++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/README-1ST b/README-1ST index b9bde80e..09ec9c95 100644 --- a/README-1ST +++ b/README-1ST @@ -54,11 +54,12 @@ it's usually fairly obvious where things have gone astray. GNU/Linux system (or Debian-based system such as Ubuntu), something like this should work (as root): - sudo apt-get install build-essential cmake autopoint texinfo python-dev \ + sudo apt-get install build-essential cmake texinfo python-dev \ zlib1g-dev libbz2-dev libgmp3-dev gettext libmpfr-dev \ libboost-date-time-dev libboost-filesystem-dev \ libboost-graph-dev libboost-iostreams-dev \ - libboost-python-dev libboost-regex-dev libboost-test-dev + libboost-python-dev libboost-regex-dev libboost-test-dev \ + doxygen libedit-dev libmpc-dev ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 86a34e08..d072cb65 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,17 @@ run: ### Ubuntu If you're going to build on Ubuntu, `sudo apt-get install ...` the -following packages (current as of Ubuntu 12.04): +following packages (current as of Ubuntu 14.04): + + sudo apt-get install build-essential cmake doxygen + libboost-system1.55-dev libboost1.55-dev python-dev + gettext git libboost-date-time1.55-dev + libboost-filesystem1.55-dev libboost-iostreams1.55-dev + libboost-python1.55-dev libboost-regex1.55-dev + libboost-test1.55-dev libedit-dev libgmp3-dev + libmpfr-dev texinfo + +Or, for Ubuntu 12.04: sudo apt-get install build-essential cmake zlib1g-dev libbz2-dev python-dev gettext libgmp3-dev libmpfr-dev libboost-dev @@ -119,13 +129,6 @@ following packages (current as of Ubuntu 12.04): libboost-filesystem-dev libboost-python-dev texinfo lcov sloccount libboost-iostreams-dev libboost-test-dev -Or, for Ubuntu Karmic: - - sudo apt-get install build-essential cmake texinfo python-dev zlib1g-dev - libbz2-dev libgmp3-dev bjam gettext cvs libboost-dev - libboost-regex-dev libboost-date-time-dev - libboost-filesystem-dev libmpfr-dev - ### Debian Debian squeeze (6.0): the version of boost in squeeze is too old diff --git a/acprep b/acprep index f9fb74d7..31ac4a47 100755 --- a/acprep +++ b/acprep @@ -71,6 +71,16 @@ class BoostInfo(object): if system == 'centos': return [ 'boost-devel' ] + elif system == 'ubuntu-trusty': + return [ 'libboost1.55-dev', + 'libboost-date-time1.55-dev', + 'libboost-filesystem1.55-dev', + 'libboost-iostreams1.55-dev', + 'libboost-python1.55-dev', + 'libboost-regex1.55-dev', + 'libboost-system1.55-dev', + 'libboost-test1.55-dev' ] + elif system == 'ubuntu-saucy' or system == 'ubuntu-precise': return [ 'autopoint', 'libboost-dev', @@ -563,7 +573,26 @@ class PrepareBuild(CommandLineApp): release = open('/etc/lsb-release') info = release.read() release.close() - if re.search('saucy', info): + if re.search('trusty', info): + self.log.info('Looks like you are using APT on Ubuntu Trusty') + packages = [ + 'sudo', 'apt-get', 'install', + 'build-essential', + 'doxygen', + 'cmake', + 'ninja-build', + 'zlib1g-dev', + 'libbz2-dev', + 'python-dev', + 'libgmp3-dev', + 'libmpfr-dev', + 'gettext', + 'libedit-dev', + 'texinfo', + 'lcov', + 'sloccount' + ] + BoostInfo().dependencies('ubuntu-trusty') + elif re.search('saucy', info): self.log.info('Looks like you are using APT on Ubuntu Saucy') packages = [ 'sudo', 'apt-get', 'install', From c61f137968d688312ac1601da06b743b742f27d1 Mon Sep 17 00:00:00 2001 From: thdox Date: Sun, 11 May 2014 17:21:49 +0200 Subject: [PATCH 2/2] Hardy, Karmic, Oneiric are obsolete Ubuntu releases. See http://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions --- acprep | 87 ---------------------------------------------------------- 1 file changed, 87 deletions(-) diff --git a/acprep b/acprep index 31ac4a47..5c0d2970 100755 --- a/acprep +++ b/acprep @@ -100,22 +100,6 @@ class BoostInfo(object): 'libboost-iostreams-dev', 'libboost-python-dev' ] - elif system == 'ubuntu-karmic' or system == 'ubuntu-hardy': - return [ 'bjam', 'libboost-dev', - 'libboost-regex-dev', - 'libboost-date-time-dev', - 'libboost-filesystem-dev', - 'libboost-iostreams-dev', - 'libboost-python-dev' ] - - elif system == 'ubuntu-oneiric': - return [ 'libboost-dev', - 'libboost-python-dev', - 'libboost-regex-dev', - 'libboost-date-time-dev', - 'libboost-filesystem-dev', - 'libboost-iostreams-dev' ] - class CommandLineApp(object): "Base class for building command line applications." @@ -629,77 +613,6 @@ class PrepareBuild(CommandLineApp): 'lcov', 'sloccount' ] + BoostInfo().dependencies('ubuntu-precise') - elif re.search('karmic', info): - self.log.info('Looks like you are using APT on Ubuntu Karmic') - packages = [ - 'sudo', 'apt-get', 'install', - 'build-essential', - 'libtool', - 'autoconf', - 'automake', - 'zlib1g-dev', - 'libbz2-dev', - 'python-dev', - 'libgmp3-dev', - 'libmpfr-dev', - 'gettext', - 'cvs', - 'libedit-dev', - #'texlive-full', - #'doxygen', - #'graphviz', - 'texinfo', - 'lcov', - 'sloccount' - ] + BoostInfo().dependencies('ubuntu-karmic') - elif re.search('hardy', info): - self.log.info('Looks like you are using APT on Ubuntu Hardy') - packages = [ - 'sudo', 'apt-get', 'install', - 'build-essential', - 'libtool', - 'autoconf', - 'automake', - 'autopoint', - 'zlib1g-dev', - 'libbz2-dev', - 'python-dev', - 'cvs', - 'gettext', - 'libgmp3-dev', - 'libmpfr-dev', - 'libedit-dev', - #'texlive-full', - #'doxygen', - #'graphviz', - 'texinfo', - 'lcov', - 'sloccount' - ] + self.boost_info.dependencies('ubuntu-hardy') - elif re.search('oneiric', info): - self.log.info('Looks like you are using APT on Ubuntu Oneiric') - packages = [ - 'sudo', 'apt-get', 'install', - 'build-essential', - 'libtool', - 'autoconf', - 'automake', - 'autopoint', - 'zlib1g-dev', - 'libbz2-dev', - 'python-dev', - 'cvs', - 'gettext', - 'libgmp3-dev', - 'libmpfr-dev', - 'libedit-dev', - #'texlive-full', - #'doxygen', - #'graphviz', - 'texinfo', - 'lcov', - 'sloccount' - ] + self.boost_info.dependencies('ubuntu-oneiric') else: self.log.info('I do not recognize your version of Ubuntu!') packages = None