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

Updated to Boost 1.50

Browse source
This commit is contained in:
John Wiegley 2012-07-30 23:22:42 -05:00
parent 39ce225004
commit 14ab4f7775
5 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -58,6 +58,7 @@ else()
set(HAVE_BOOST_PYTHON 0)
endif()
# Set BOOST_ROOT to help CMake to find the right Boost version
find_package(Boost 1.46.0
REQUIRED date_time filesystem system iostreams regex unit_test_framework
${BOOST_PYTHON})

11
acprep
View file

@ -99,7 +99,7 @@ class CommandLineApp(object):
force_exit = True # If true, always ends run() with sys.exit()
log_handler = None
boost_major = "1_49"
boost_major = "1_50"
options = {
'debug': False,
@ -674,14 +674,17 @@ class PrepareBuild(CommandLineApp):
self.CXXFLAGS.append('-Wno-disabled-macro-expansion')
if self.current_flavor == 'opt':
self.configure_args.append('-DCMAKE_CXX_FLAGS:STRING=-O4')
self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS:STRING=-O4')
self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O4')
self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS_RELEASE:STRING=-O4')
#else:
# self.CXXFLAGS.append('-g -O1 -faddress-sanitizer')
# self.LDFLAGS.append('-g -O1 -faddress-sanitizer')
self.configure_args.append('-DCMAKE_INCLUDE_PATH:STRING=/usr/local/include;/opt/local/include')
self.configure_args.append('-DCMAKE_LIBRARY_PATH:STRING=/usr/local/lib;/opt/local/lib')
self.configure_args.append('-DBOOST_ROOT=/usr/local')
self.configure_args.append('-DBOOST_INCLUDEDIR=/usr/local/include/boost-1_49')
self.configure_args.append('-DBOOST_INCLUDEDIR=/usr/local/include/boost-1_50')
self.configure_args.append('-DBoost_COMPILER=-clang-darwin')
self.configure_args.append(self.source_dir)

4
lib/Makefile
View file

@ -6,7 +6,7 @@ STOW_ROOT = /usr/local/stow
PRODUCTS = $(HOME)/Products
GCC_VERSION = 4.7
BOOST_VERSION = 1_49_0
BOOST_VERSION = 1_50_0
CC = gcc-mp-$(GCC_VERSION)
ifeq ($(CC),clang)
@ -27,7 +27,7 @@ BOOST_SOURCE = boost-release
ifeq ($(GCC_VERSION),4.7)
BOOST_DEFINES = define=_GLIBCXX__PTHREADS=1
else
BOOST_DEFINES =
BOOST_DEFINES =
endif
ifeq ($(CC),clang)
BOOST_TOOLSET = clang

6
lib/build.sh
View file

@ -7,11 +7,11 @@
export PATH=$PATH:/opt/local/lib/openmpi/bin
cat > ~/user-config.jam <<EOF
using clang-darwin : : "/usr/local/bin/clang++" : <cxxflags>-std=c++11 <include>/usr/local/include ;
using clang-darwin : : "/usr/local/bin/clang++" : <cxxflags>-std=c++11 ;
EOF
# jww (2012-04-24): This is still linking against /usr/lib/libc++.1.dylib
# instead of /usr/local/lib/libc++.1.dylib
make CXX=clang++ LD=clang++ CC=clang OPTJ=-j20 \
make CXX=clang++ LD=clang++ CC=clang OPTJ=-j20 \
BOOST_TOOLSET=clang-darwin DIR_SUFFIX=clang31 \
BOOST_DEFINES="-sICU_PATH=/usr/local cxxflags=\"-g -std=c++11 -nostdlibinc -I/usr/local/include -I/usr/local/include/c++/v1 -I/opt/local/include -I/usr/include -stdlib=libc++\" linkflags=\"-g -Z -L/usr/local/lib -L/opt/local/lib -L/usr/lib /usr/local/lib/libc++.dylib -stdlib=libc++\""
BOOST_DEFINES="-sHAVE_ICONV=1 -sICONV_PATH=/usr/local -sHAVE_ICU=1 -sICU_PATH=/usr/local cxxflags=\"-g -std=c++11 $* -nostdlibinc -isystem /usr/local/include -isystem /opt/local/include -isystem /usr/local/include/c++/v1 -isystem /usr/include -stdlib=libc++\" linkflags=\"-g $* -L/usr/local/lib -L/opt/local/lib -L/usr/lib /usr/local/lib/libc++.dylib -stdlib=libc++\""

17
tools/build.sh
View file

@ -3,10 +3,13 @@
flavor=$1
shift 1
time ( \
cd ~/src/ledger ; \
PATH=/usr/local/bin:/opt/local/bin:$PATH \
nice -n 20 ./acprep $flavor --debug --python --doxygen make "$@" && \
PATH=/usr/local/bin:/opt/local/bin:$PATH \
nice -n 20 ./acprep $flavor --debug --python --doxygen check "$@" \
)
JOBS=-j$(sysctl -n hw.activecpu)
OPTIONS="$flavor --debug --python --doxygen $JOBS"
time ( \
cd ~/src/ledger ; \
PATH=/usr/local/bin:/opt/local/bin:$PATH \
nice -n 20 ./acprep $OPTIONS make "$@" && \
PATH=/usr/local/bin:/opt/local/bin:$PATH \
nice -n 20 ./acprep $OPTIONS check "$@" \
)