[SCM] FreeFem++ packaging branch, experimental, updated. debian/3.20-1-13-gbd0dac0

[Christophe Trophime]

The following commit has been merged in the experimental branch:
commit 633862f1f5b13e8456380f36c54bc74d2247bc09
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Mon Feb 11 13:26:32 2013 +0100

    add corrected scripts to build plugins

diff --git a/examples++-load/load.link.in b/debian/ff-c++
similarity index 62%
copy from examples++-load/load.link.in
copy to debian/ff-c++
index 8224bba..7a381e2 100755
--- a/examples++-load/load.link.in
+++ b/debian/ff-c++
@@ -4,44 +4,16 @@
 thecommand="$0"
 dircommand=`dirname "$0"`
 
-FFVERSION='@VERSION@'
-FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
-FFFFLAGS='@FFLAGS@'
-FFFLIBS='@FLIBS@'
-INCFF=
-if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
-if [ -z "$MPICXX" ] ; then MPICXX="@MPICXX@" ; fi
-if [ -z "$MPI_LIB" ] ; then MPI_LIB="@MPI_LIB@" ; fi
-if [ -z "$F77" ] ; then F77="@F77@" ; fi
-if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
-if [ "$MPICXX" = '@'MPICXX'@' ] ; then MPICXX=""; fi
-if [ "$F77" = '@'F77'@' ] ; then F77=""; fi
-if [ "$FFCXXFLAGS" = '@'CXXFLAGS'@' ] ; then FFCXXFLAGS=""; fi
-if [ "$FFFFLAGS" = '@'FFLAGS'@' ] ; then FFFFLAGS=""; fi
-if [ "$FFFLIBS" = '@'FLIBS'@' ] ; then FFFLIBS=""; fi
-if [ "$FFVERSION" = '@'VERSION'@' ] ; then FFVERSION=""; fi
-if [ -z "$INCFF" ] ; then
-    if [ -f "@INCFF@/ff++.hpp" ] ; then
-	INCFF="-I at INCFF@"
-    elif [ -f "${dircommand}/include/ff++.hpp" ]; then
-	INCFF="-I${dircommand}/include"
-    elif [ -f ../examples++-load/include/ff++.hpp ]; then
-	INCFF="-Iinclude"
-    elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
-	INCFF="-IFFAPPLI_INC" 
-    elif [ -f '@ff_prefix_dir@/include/ff++.hpp' ] ; then 
-	INCFF='-I at ff_prefix_dir@/include' 
-    else
-	ff=`which freefem++.exe`;
-	ffinc=`dirname "$ff"`/examples++-load/include
-	if [ -f "$ffinc/ff++.hpp" ]; then
-	  INCFF=-I"'$ffinc'";
-        else	
-	  echo " erreur PB include freefem++ directory " ;
-	  exit 1;
-	fi
-    fi
-fi
+FFVERSION='3.20'
+FFCXXFLAGS='-g  -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -DBAMG_LONG_LONG  -DNCHECKPTR -fPIC -D_FORTIFY_SOURCE=2 '
+FFFFLAGS='-g  -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC'
+FFFLIBS='/usr/lib/gcc/x86_64-linux-gnu/4.7/libgfortran.so'
+INCFF='-I/usr/include/freefem++/'
+if [ -z "$CXX" ] ; then CXX='mpic++' ; fi
+if [ -z "$MPICXX" ] ; then MPICXX="/usr/bin/mpic++" ; fi
+if [ -z "$MPI_LIB" ] ; then MPI_LIB="-pthread -L/usr/lib/openmpi/lib -lmpi_cxx -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl " ; fi
+if [ -z "$F77" ] ; then F77="gfortran" ; fi
+
 do="yes"
 DEBUG=""
 CONLY="false"
@@ -56,27 +28,6 @@ fileso=""
 OTHER="";
 WIN32="";
 
-case "$uu" in
-  CYGWIN*|MINGW*)
-  if [ -z "@WIN32DLLTARGET@" ] ; then 
-      onwin32=1; uu="cygwin-version";
-  else
-      onwin32=1; uu="win32"; # pure windows 
-  fi
-  WIN32="win32-"
-  wff=`which FreeFem++.exe`
-  dff=`dirname "$wff"`
-  if [ "$bin" = "." -a  -f ../src/bin-win32/libff.dll  ]; then
-    bin=../src/bin-win32 
-  elif [  -f "$dff/libff.dll"  ]; then
-#  modif for install on cygwin
-    bin="$dff"
-  elif [ "$bin" = "." -a  -f ../libff.dll  ]; then
-    bin=..
-  elif [ "$bin" = "." -a  -f ../../libff.dll  ]; then
-    bin=../..
-  fi;; 
-esac
 autodep=""
 withmpi=""
 args=""
@@ -175,43 +126,8 @@ test "$withmpi" = "yes" && WMPI_LIB="$MPI_LIB"
 
 INC="$INCFF $INC"  
 SUF=so
-SHARED="-shared"
-case "$WIN32$uu" in
-    Darwin*) 
-#        echo "export MACOSX_DEPLOYMENT_TARGET=10.3"
-	export MACOSX_DEPLOYMENT_TARGET=10.4
-	SUF=dylib
-	SHARED="-bundle -undefined dynamic_lookup"  ;;
-    win32-CYGWIN*|win32-win32)
-        echo " Window without cygwin "
-	WMPI_LIB=''
-        b="$bin"
-        LIBS=" '$b/libff.dll' $LIBS $DLL"
-        SHARED="-shared --unresolved-symbols=ignore-all -Wl,--enable-auto-import"
-        FLAGS='  -mno-cygwin '
-        SUF=dll;;
-    win32-cygwin-version)
-        echo " cygwin-version "
-	WMPI_LIB=''
-        b=$bin
-        FLAGS=' '
-        LIBS="'$b/libff.dll' $LIBS $DLL"
-        SUF=dll;;
-    FreeBSD|NetBSD)
-	SHARED="-shared" 
-	FLAGS='-fPIC';;
-	# 64 bit Linux needs -fPIC (ALH)
-    SunOS)
-        SHARED="-shared"
-        FLAGS='-fPIC';;
-        # 64 bit Linux needs -fPIC (ALH)
-    Linux)
-	FLAGS='-fPIC'
-	SHARED="-shared " ;;
-    *)
-	echo "sorry unknown achitecture "`uname`
-	exit 1;;
-esac
+FLAGS='-fPIC'
+SHARED="-shared "
 
 
 #FLAGS="$FLAGS $DEBUG $FFCXXFLAGS"
@@ -219,11 +135,6 @@ esac
 FLAGS="$FLAGS $DEBUG"
 
 if [ -n "$ffiles$files$fileso" ] ; then
-    if [  -n "$WIN32"  -a  ! -f "$bin/libff.dll"  ]; then
-	echo " Sorry, no freefem .dll file (libff.dll)  in $bin dir "
-	echo " try with -b dir-path where the file libff.dll exist"
-	exit 1;
-    fi
     if [ "$files" ] ;then 
 	echo $CXX -c $FLAGS $CXXFLAGS $FFCXXFLAGS $INC $PIC $files
 	if [  $do = yes ] ; then 
diff --git a/examples++-load/ff-get-dep.in b/debian/ff-get-dep
similarity index 77%
copy from examples++-load/ff-get-dep.in
copy to debian/ff-get-dep
index 9f7c52c..d722bfc 100755
--- a/examples++-load/ff-get-dep.in
+++ b/debian/ff-get-dep
@@ -1,16 +1,8 @@
 #!/bin/sh
 # ff-c++ `./ff-get-dep -ff metis.cpp`
-wherelib=WHERE_LIBRARY
-dircommand=`dirname $0`
-if [   -f "$wherelib-download" ] ; then
-    wherelib=WHERE_LIBRARY
-elif [   -f "$dircommand/$wherelib-download" ] ; then
-    wherelib=$dircommand/WHERE_LIBRARY
-elif [ -f '@ff_prefix_dir@/WHERE_LIBRARY-download' ] ; then
-    wherelib='@ff_prefix_dir@/WHERE_LIBRARY'
-else
-   echo " error no WHERE_LIBRARY  file "
-   exit 1;
+wherelib=WHERE_LIBRARY'/usr/include/freefem++/WHERE_LIBRARY'
+if [   -f "$HOME/.freefem++/WHERE_LIBRARY" ] ; then
+    wherelib='$HOME/.freefem++/WHERE_LIBRARY'
 fi
 
 

-- 
FreeFem++ packaging