Changeset 22509

Timestamp:

03/09/18 10:45:13 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: now use latest version of valgrind

Location:

issm/trunk-jpl/externalpackages/valgrind

Files:

• install-linux64.sh (modified) (1 diff)
• install-macosx32.sh (deleted)
• install-macosx64.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/valgrind/install-linux64.sh

@@ -3 +3 @@
 
 #Some cleanup
-rm -rf install valgrind-3.10.0
-mkdir install
+rm -rf install 
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.10.0.tar.bz2' 'valgrind-3.10.0.tar.bz2'
-
-#Untar 
-tar -jxvf  valgrind-3.10.0.tar.bz2
-
-#Move valgrind into install directory
-mv valgrind-3.10.0/* install
-rm -rf valgrind-3.10.0
+#Download development version
+git clone git://sourceware.org/git/valgrind.git install
 
 #configure
 cd install
-./configure  --prefix="$ISSM_DIR/externalpackages/valgrind/install"
+./autogen.sh
+./configure  --prefix="$ISSM_DIR/externalpackages/valgrind/install" --enable-only64bit
 
 #Compile valgrind
-make  -j 4
-make install
-
-#final thing: if mpi is compiled in, soft link its target to a simpler name
-cd lib
-ln -s valgrind/libmpiwrap-*  ./libmpidebug.so
+if [ $# -eq 0 ]; then
+        make
+else
+        make -j $1
+fi
+make install 

issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh

@@ -6 +6 @@
 
 #Download development version, the current release never supports the latest OS X releases
-svn co svn://svn.valgrind.org/valgrind/trunk install
+git clone git://sourceware.org/git/valgrind.git install
 
 #configure
@@ -14 +14 @@
 
 #Compile valgrind
-
-make  -j 8
-make install
+if [ $# -eq 0 ]; then
+        make
+else
+        make -j $1
+fi
+make install