Changeset 21963

Timestamp:

08/16/17 23:43:37 (8 years ago)

Author:

dlcheng

Message:

CHG: Updating emscripten install directory to avoid reinstallation on jenkins build. Fixing gsl JS unesolved symbols during linking with --disable-shared option.

Location:

issm/trunk-jpl/externalpackages

Files:

• emscripten/install.sh (modified) (2 diffs)
• gsl/install-javascript.sh (modified) (1 diff)
• triangle/install-javascript.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/emscripten/install.sh

@@ -3 +3 @@
 
 #Some cleanup
-rm -rf src
+rm -rf install
 
 #Download from ISSM server
@@ -10 +10 @@
 #Untar and move petsc to install directory
 tar -zxvf  emsdk-portable.tar.gz
-mv emsdk_portable src
+mv emsdk_portable install
 
-cd src 
+cd install 
 
 export CXX=g++

issm/trunk-jpl/externalpackages/gsl/install-javascript.sh

@@ -22 +22 @@
 export CXX=em++
 #Source emscripten to ensure emcc/em++ compiler are in env
-source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
+source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
 
 # Issue with variadic function signatures.
 export CFLAGS=-DSTDC_HEADERS
 
-./configure --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" 
+./configure --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" \
+        --disable-shared
 
 #Compile gsl

issm/trunk-jpl/externalpackages/triangle/install-javascript.sh

@@ -10 +10 @@
 
 #Source emscripten to ensure emcc/em++ compiler are in env
-source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
+source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
 
 #Untar