Changeset 18306

Timestamp:

07/30/14 16:06:30 (11 years ago)

Author:

schlegel

Message:

CHG: update mavericks build

Location:

issm/trunk-jpl/externalpackages/boost

Files:

• configs/1.55/darwin.jam.patch (added)
• configs/1.55/darwin.py.patch (added)
• configs/1.55/user-config.jam.patch (added)
• install-1.55-macosx-mavericks.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/boost/install-1.55-macosx-mavericks.sh

@@ -22 +22 @@
 rm -rf boost_1_55_0
 
-patch src/boost/atomic/detail/cas128strong.hpp ./configs/1.55/cas128strong.hpp.patch
-patch src/boost/atomic/detail/gcc-atomic.hpp ./configs/1.55/gcc-atomic.hpp.patch
+#patch src/boost/atomic/detail/cas128strong.hpp ./configs/1.55/cas128strong.hpp.patch
+#patch src/boost/atomic/detail/gcc-atomic.hpp ./configs/1.55/gcc-atomic.hpp.patch
+patch src/tools/build/v2/user-config.jam ./configs/1.55/user-config.jam.patch
+patch src/tools/build/v2/tools/darwin.jam ./configs/1.55/darwin.jam.patch
+patch src/tools/build/v2/tools/darwin.py ./configs/1.55/darwin.py.patch
 
 #Configure and compile
@@ -29 +32 @@
 ./bootstrap.sh \
         --prefix="$ISSM_DIR/externalpackages/boost/install" \
-        --with-python=python3.2 \
+        --with-python=python2.7 \
         --with-python-root="$ISSM_DIR/externalpackages/python/install" 
 
 #Compile boost
-./b2 toolset=clang cxxflags=-stdlib=libstdc++ linkflags=-stdlib=libstdc++ -j2 variant=release link=static threading=multi install
-#./bjam install
+# Need gcc with iconv installed in a location that has been added to your path
+./bjam toolset=darwin-std0x link=static install
+
+#./b2 toolset=clang cxxflags=-stdlib=libstdc++ linkflags=-stdlib=libstdc++ -j2 variant=release link=static threading=multi instal
 
 #put bjam into install also: