diff options
| -rwxr-xr-x | acprep | 50 | ||||
| -rw-r--r-- | lib/Makefile | 108 |
2 files changed, 52 insertions, 106 deletions
@@ -676,15 +676,15 @@ class PrepareBuild(CommandLineApp): environ, conf_args = self.configure_environment() - boost = 'boost_1_40_0' - tarball = boost + '.tar.bz2' + boost = 'boost_1_41_0' + tarball = boost + '.7z' if not exists(boost): if not exists(tarball): self.log.info('Downloading Boost source tarball ...') self.execute('curl', '-L', '-o', tarball, 'http://downloads.sourceforge.net/boost/' + - boost + '.tar.bz2?use_mirror=ufpr') + boost + '.7z?use_mirror=ufpr') if not exists(tarball): self.log.error('Failed to locate the Boost source tarball') @@ -699,12 +699,12 @@ class PrepareBuild(CommandLineApp): fd.close() digest = csum.hexdigest() - if digest != 'a17281fd88c48e0d866e1a12deecbcc0': + if digest != 'b74ee2f0f46cef601544dd4ac2d7dec4': self.log.error('Boost source tarball fails to match checksum') sys.exit(1) self.log.info('Extracting Boost source tarball ...') - self.execute('tar', 'xjf', tarball) + self.execute('7za', 'x', tarball) if not exists(boost): self.log.error('Failed to locate the Boost sources') @@ -1037,33 +1037,17 @@ class PrepareBuild(CommandLineApp): if self.options.use_glibcxx_debug: self.CPPFLAGS.append('-D_GLIBCXX_DEBUG=1') - if exists('/usr/local/stow/cppunit-debug/include'): - if '/usr/local/stow/cppunit/include' in self.sys_include_dirs: - self.sys_include_dirs.remove('/usr/local/stow/cppunit/include') - self.sys_library_dirs.remove('/usr/local/stow/cppunit/lib') - - 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('/usr/local/lib/libboost_regex-xgcc44-sd-1_40.a'): + if exists('/usr/local/lib/libboost_regex-xgcc44-sd-1_41.a'): self.envvars['BOOST_HOME'] = '/usr/local' - self.envvars['BOOST_SUFFIX'] = '-xgcc44-sd-1_40' - self.sys_include_dirs.append('/usr/local/include/boost-1_40') + self.envvars['BOOST_SUFFIX'] = '-xgcc44-sd-1_41' + self.sys_include_dirs.append('/usr/local/include/boost-1_41') self.inform_boost_location('is really located', self.envvars['BOOST_SUFFIX']) - elif exists('/usr/local/lib/libboost_regex-xgcc44-d-1_40.a'): + elif exists('/usr/local/lib/libboost_regex-xgcc44-d-1_41.a'): self.envvars['BOOST_HOME'] = '/usr/local' - self.envvars['BOOST_SUFFIX'] = '-xgcc44-d-1_40' - self.sys_include_dirs.append('/usr/local/include/boost-1_40') + self.envvars['BOOST_SUFFIX'] = '-xgcc44-d-1_41' + self.sys_include_dirs.append('/usr/local/include/boost-1_41') self.inform_boost_location('is really located', self.envvars['BOOST_SUFFIX']) @@ -1082,17 +1066,17 @@ class PrepareBuild(CommandLineApp): self.inform_boost_location('is really located', self.envvars['BOOST_SUFFIX']) - elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'): + elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_41.a'): self.envvars['BOOST_HOME'] = '/usr/local' - self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40' - self.sys_include_dirs.append('/usr/local/include/boost-1_40') + self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_41' + self.sys_include_dirs.append('/usr/local/include/boost-1_41') self.inform_boost_location('is really located', self.envvars['BOOST_SUFFIX']) - elif exists('/usr/local/lib/libboost_regex-xgcc44-1_40.a'): + elif exists('/usr/local/lib/libboost_regex-xgcc44-1_41.a'): self.envvars['BOOST_HOME'] = '/usr/local' - self.envvars['BOOST_SUFFIX'] = '-xgcc44-1_40' - self.sys_include_dirs.append('/usr/local/include/boost-1_40') + self.envvars['BOOST_SUFFIX'] = '-xgcc44-1_41' + self.sys_include_dirs.append('/usr/local/include/boost-1_41') self.inform_boost_location('is really located', self.envvars['BOOST_SUFFIX']) diff --git a/lib/Makefile b/lib/Makefile index 608be7d5..7714f21d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -2,96 +2,58 @@ # This is only important if you intend to produce a Ledger binary for # installation. -STOW_ROOT = /usr/local/stow -PRODUCTS = $(HOME)/Products - -EXTRA_DEFINES = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 - -BOOST_SOURCE = boost -BOOST_VERSION = 1_40_0 +STOW_ROOT = /usr/local/stow +PRODUCTS = $(HOME)/Products + +CC = gcc-mp-4.4 +CXX = g++-mp-4.4 +LD = gcc-mp-4.4 +CPPFLAGS = -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 +CFLAGS = $(CPPFLAGS) -g +LDFLAGS = -g + +BOOST_VERSION = 1_41_0 +BOOST_SOURCE = boost_$(BOOST_VERSION) BOOST_TOOLSET = darwin -BOOST_DEFINES = define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 +BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 +#BOOST_FLAGS = --architecture=x86 --address_model=32_64 BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \ --build-type=complete --layout=versioned \ $(BOOST_DEFINES) -ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu -ICU_DBG_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu-debug +ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu -icu-release: - -(cd icu/source; make distclean) - (cd icu/source; sh autogen.sh; \ - ./configure CPPFLAGS="$(EXTRA_DEFINES)" \ - CFLAGS="$(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ - LDFLAGS="$(ARCH_LDFLAGS)" \ - CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ - --enable-static \ - --prefix=$(STOW_ROOT)/icu && \ - make install) +all: boost-build cppunit-build icu-build boost-icu-build -icu-debug: - -(cd icu/source; make distclean) - (cd icu/source; sh autogen.sh; \ - ./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1 $(EXTRA_DEFINES)" \ - CFLAGS="-g $(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ - LDFLAGS="-g $(ARCH_LDFLAGS)" \ - CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ - --enable-static --enable-debug \ - --prefix=$(STOW_ROOT)/icu-debug && \ - make install) - -icu-build: icu-release icu-debug - -boost-icu-release: - (cd $(BOOST_SOURCE) && \ - bjam release --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \ - --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \ - $(BOOST_FLAGS) $(ICU_FLAGS) install) - -boost-icu-debug: - (cd $(BOOST_SOURCE) && \ - bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \ - --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \ - $(BOOST_FLAGS) define=_GLIBCXX_DEBUG=1 \ - $(ICU_DBG_FLAGS) install) - -boost-icu-build: boost-icu-release boost-icu-debug - -boost-release: - (cd $(BOOST_SOURCE) && \ - bjam release --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \ - --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \ - $(BOOST_FLAGS) install) - -boost-debug: +boost-build: (cd $(BOOST_SOURCE) && \ bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \ --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \ - $(BOOST_FLAGS) define=_GLIBCXX_DEBUG=1 install) - -boost-build: boost-release boost-debug + $(BOOST_FLAGS) install) -cppunit-release: +cppunit-build: -(cd cppunit; make distclean) (cd cppunit; sh autogen.sh; \ - ./configure CPPFLAGS="$(EXTRA_DEFINES)" \ - CFLAGS="$(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ - LDFLAGS="$(ARCH_LDFLAGS)" \ + ./configure CPPFLAGS="$(CPPFLAGS)" \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ --prefix=$(STOW_ROOT)/cppunit \ --disable-doxygen --disable-dot && \ make install) -cppunit-debug: - -(cd cppunit; make distclean) - (cd cppunit; sh autogen.sh; \ - ./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1 $(EXTRA_DEFINES)" \ - CFLAGS="-g $(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ - LDFLAGS="-g $(ARCH_LDFLAGS)" \ +icu-build: + -(cd icu/source; make distclean) + (cd icu/source; sh autogen.sh; \ + ./configure CPPFLAGS="$(CPPFLAGS)" \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ - --prefix=$(STOW_ROOT)/cppunit-debug \ - --disable-doxygen --disable-dot && \ + --enable-static --enable-debug \ + --prefix=$(STOW_ROOT)/icu && \ make install) -cppunit-build: cppunit-release cppunit-debug - -all: boost-build boost-icu-build cppunit-build +boost-icu-build: + (cd $(BOOST_SOURCE) && \ + bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \ + --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \ + $(BOOST_FLAGS) $(ICU_FLAGS) install) |