Changeset 25224

Timestamp:

07/07/20 14:11:22 (5 years ago)

Author:

jdquinn

Message:

BUG: Fix for linking stage on Mac that allows for library renaming; cleanup

Location:

issm/trunk-jpl/externalpackages/boost

Files:

• install-1.7-linux-static.sh (modified) (1 diff)
• install-1.7-linux.sh (modified) (1 diff)
• install-1.7-mac-static.sh (modified) (2 diffs)
• install-1.7-mac.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/boost/install-1.7-linux-static.sh

@@ -35 +35 @@
 
 # Compile and install
-./b2 link=static install
+./b2 install link=static runtime-link=static
 
 # Remove any dynamic libraries that may have been compiled

issm/trunk-jpl/externalpackages/boost/install-1.7-linux.sh

@@ -35 +35 @@
 
 # Compile and install
-./b2 install
+./b2 install link=shared runtime-link=shared

issm/trunk-jpl/externalpackages/boost/install-1.7-mac-static.sh

@@ -28 +28 @@
 cd src
 ./bootstrap.sh \
-        --prefix=${BOOST_ROOT}/install \
+        --prefix="${BOOST_ROOT}/install" \
         --with-python=python2.7
 
@@ -35 +35 @@
 
 # Compile and install
-./b2 link=static install
+./b2 install link=static runtime-link=static
 
 # Remove any dynamic libraries that may have been compiled

issm/trunk-jpl/externalpackages/boost/install-1.7-mac.sh

@@ -10 +10 @@
 #
 export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
+export LDFLAGS="-Wl,-headerpad_max_install_names"
 
 # Download source
@@ -35 +36 @@
 
 # Compile and install
-./b2 install
+./b2 install link=shared runtime-link=shared
 
 # Set install_name for all shared libraries