diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile gildas-src-apr11f.patched/admin/Makefile --- gildas-src-apr11f/admin/Makefile 2007-12-12 11:23:47.000000000 +0100 +++ gildas-src-apr11f.patched/admin/Makefile 2011-06-29 16:39:04.000000000 +0200 @@ -33,31 +33,31 @@ integ: integ-message integ-message: - @(echo) - @(echo "Compilation succeeded! Bye.") - @(echo) +# @(echo) +# @(echo "Compilation succeeded! Bye.") +# @(echo) default-install: install-message install-message: - @(echo) - @(echo "***************************************************************************") - @(echo "Installation succeeded!") - @(echo) - @(echo "bash users: You should add in your ~/.bash_profile the following lines") - @(echo " export GAG_ROOT_DIR=$(gagexedir)") - @(echo " export GAG_EXEC_SYSTEM=$(GAG_EXEC_SYSTEM)") - @(echo ' source $$GAG_ROOT_DIR/etc/bash_profile') - @(echo) - @(echo "csh users: You should add in your ~/.login the following lines") - @(echo " setenv GAG_ROOT_DIR $(gagexedir)") - @(echo " setenv GAG_EXEC_SYSTEM $(GAG_EXEC_SYSTEM)") - @(echo ' source $$GAG_ROOT_DIR/etc/login') - @(echo) - @(echo "You should then exit this xterm and open a new one to reset your path.") - @(echo "GILDAS should be ready for use (e.g. type greg @ gag_demo:demo).") - @(echo "Bye.") - @(echo "***************************************************************************") - @(echo) +# @(echo) +# @(echo "***************************************************************************") +# @(echo "Installation succeeded!") +# @(echo) +# @(echo "bash users: You should add in your ~/.bash_profile the following lines") +# @(echo " export GAG_ROOT_DIR=$(gagexedir)") +# @(echo " export GAG_EXEC_SYSTEM=$(GAG_EXEC_SYSTEM)") +# @(echo ' source $$GAG_ROOT_DIR/etc/bash_profile') +# @(echo) +# @(echo "csh users: You should add in your ~/.login the following lines") +# @(echo " setenv GAG_ROOT_DIR $(gagexedir)") +# @(echo " setenv GAG_EXEC_SYSTEM $(GAG_EXEC_SYSTEM)") +# @(echo ' source $$GAG_ROOT_DIR/etc/login') +# @(echo) +# @(echo "You should then exit this xterm and open a new one to reset your path.") +# @(echo "GILDAS should be ready for use (e.g. type greg @ gag_demo:demo).") +# @(echo "Bye.") +# @(echo "***************************************************************************") +# @(echo) ########################################################################### diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile.build gildas-src-apr11f.patched/admin/Makefile.build --- gildas-src-apr11f/admin/Makefile.build 2011-02-07 11:16:34.000000000 +0100 +++ gildas-src-apr11f.patched/admin/Makefile.build 2011-06-29 16:39:04.000000000 +0200 @@ -313,6 +313,10 @@ -lm: +-lLAPACK: + +-lBLAS: + # Required by ASDM libs: -lstdc++: diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile.def gildas-src-apr11f.patched/admin/Makefile.def --- gildas-src-apr11f/admin/Makefile.def 2011-06-29 13:30:14.000000000 +0200 +++ gildas-src-apr11f.patched/admin/Makefile.def 2011-06-29 16:41:09.000000000 +0200 @@ -318,8 +318,8 @@ # C compilation # C compiler name -CC = gcc -CXX = g++ +CC = gcc-4 +CXX = g++-4 ifeq ($(GAG_OS_KIND),hpux) CC = c89 endif @@ -341,7 +341,7 @@ endif # GCC flags -ifeq ($(CC),gcc) +ifeq ($(CC),gcc-4) # Generic to GCC GLOBAL_CFLAGS += -pipe -fPIC OPTION_CFLAGS += -Wall @@ -377,13 +377,6 @@ # OS dependent flags GLOBAL_CFLAGS += -D$(GAG_OS_KIND) -D$(LOCAL_UPPER_OS_KIND) -ifeq ($(GAG_OS_KIND),darwin) - ifeq ($(GAG_USE_32BITS),yes) - GLOBAL_CFLAGS += -m32 - GLOBAL_CLDFLAGS += -m32 - endif -endif - # External library flags ifeq ($(PNG_PRESENT),yes) GLOBAL_CFLAGS += -DPNG @@ -574,12 +567,12 @@ # Compilation in 32 bits mode GAG_32BITS_SWITCH = "-m32" endif -STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CPP_EXT)) +STDCpp_LIB += $(shell g++-4 $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CPP_EXT)) ########################################################################### # Kernel libraries -LEGACY_LIBS = -lslatec -llapack -lblas +LEGACY_LIBS = -lslatec -lLAPACK -lBLAS _GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc ifndef GAG_WIN32 GAG_LIBS = $(_GAG_LIBS) diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile.python gildas-src-apr11f.patched/admin/Makefile.python --- gildas-src-apr11f/admin/Makefile.python 2011-02-08 15:40:52.000000000 +0100 +++ gildas-src-apr11f.patched/admin/Makefile.python 2011-06-29 16:39:04.000000000 +0200 @@ -41,7 +41,7 @@ ifneq ($(MOD_IDENTITY),) $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py - python $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir) + python2.6 $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir) $(MV) $(builddir)/*.$(SO_EXT) $(pythondir) $(builddir)/setup.py: setup.py.src Makefile diff -ruN --exclude='*~' gildas-src-apr11f/admin/gildas-env.sh gildas-src-apr11f.patched/admin/gildas-env.sh --- gildas-src-apr11f/admin/gildas-env.sh 2011-06-20 11:44:09.000000000 +0200 +++ gildas-src-apr11f.patched/admin/gildas-env.sh 2011-06-29 16:39:04.000000000 +0200 @@ -438,7 +438,7 @@ if [ "$GAG_OS_KIND" = "cygwin" ]; then gagenv_message "ATM 2009 is not supported under cygwin" ATM2009_PRESENT=no - elif \which g++ > /dev/null 2>&1; then + elif \which g++-4 > /dev/null 2>&1; then ATM2009_PRESENT=yes else gagenv_message "g++ not found in your \$PATH" @@ -452,25 +452,25 @@ NUMPY_PRESENT=no NUMERIC_PRESENT=no SQLITE3_PRESENT=no - if \which python > /dev/null 2>&1; then + if \which python2.6 > /dev/null 2>&1; then # Check the version of python the user is currently using - if python -V 2>&1 > /dev/null 2>&1; then - PY_VERS=`python -V 2>&1 | cut -d' ' -f2 | sed "s%\([0-9]\.[0-9][0-9]*\).*%\1%"` + if python2.6 -V 2>&1 > /dev/null 2>&1; then + PY_VERS=`python2.6 -V 2>&1 | cut -d' ' -f2 | sed "s%\([0-9]\.[0-9][0-9]*\).*%\1%"` # # Now search for Numpy or Numeric - if python -c "import numpy" > /dev/null 2>&1; then + if python2.6 -c "import numpy" > /dev/null 2>&1; then NUMPY_PRESENT=yes - NUMPY_INC_DIR=`python -c "import numpy; print numpy.__path__[0] + '/core/include'"` + NUMPY_INC_DIR=`python2.6 -c "import numpy; print numpy.__path__[0] + '/core/include'"` if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then NUMPY_INC_PRESENT=yes else NUMPY_INC_PRESENT=no fi - elif python -c "import Numeric"> /dev/null 2>&1; then + elif python2.6 -c "import Numeric"> /dev/null 2>&1; then NUMERIC_PRESENT=yes fi # Search for sqlite3 - if python -c "import sqlite3" > /dev/null 2>&1; then + if python2.6 -c "import sqlite3" > /dev/null 2>&1; then SQLITE3_PRESENT=yes fi fi @@ -541,11 +541,11 @@ ATM2003_PRESENT=yes ATM2003_LIB_DIR=$DIR fi - if file_present "liblapack." "${DIR}"; then + if file_present "libLAPACK." "${DIR}"; then LAPACK_PRESENT=yes LAPACK_LIB_DIR=$DIR fi - if file_present "libblas." "${DIR}"; then + if file_present "libBLAS." "${DIR}"; then BLAS_PRESENT=yes BLAS_LIB_DIR=$DIR fi diff -ruN --exclude='*~' gildas-src-apr11f/packages/clic/lib/Makefile gildas-src-apr11f.patched/packages/clic/lib/Makefile --- gildas-src-apr11f/packages/clic/lib/Makefile 2011-02-02 16:58:56.000000000 +0100 +++ gildas-src-apr11f.patched/packages/clic/lib/Makefile 2011-06-29 16:39:04.000000000 +0200 @@ -57,7 +57,7 @@ # Mathematical library dependency ifeq ($(LINEAR),lapack) LINEAR_LIB_OBJECTS = singular.o mth_lapack.o - LINEAR_LIB_DEPENDS = -llapack -lblas + LINEAR_LIB_DEPENDS = -lLAPACK -lBLAS else ifeq ($(LINEAR),nag) LINEAR_LIB_OBJECTS = mth_nag.o diff -ruN --exclude='*~' gildas-src-apr11f/packages/clic07/lib/Makefile gildas-src-apr11f.patched/packages/clic07/lib/Makefile --- gildas-src-apr11f/packages/clic07/lib/Makefile 2011-02-01 17:14:17.000000000 +0100 +++ gildas-src-apr11f.patched/packages/clic07/lib/Makefile 2011-06-29 16:39:04.000000000 +0200 @@ -52,7 +52,7 @@ # Mathematical library dependency ifeq ($(LINEAR),lapack) LINEAR_LIB_OBJECTS = singular.o mth_lapack.o - LINEAR_LIB_DEPENDS = -llapack -lblas + LINEAR_LIB_DEPENDS = -lLAPACK -lBLAS else ifeq ($(LINEAR),nag) LINEAR_LIB_OBJECTS = mth_nag.o