[getdp] 07/30: corrected patches
Matteo F. Vescovi
mfv at moszumanska.debian.org
Thu Feb 11 10:12:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
mfv pushed a commit to tag 2.2.0-1
in repository getdp.
commit 57a56a6315dabbc01e391fbfee70c38c51033c06
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date: Wed Jun 30 20:14:19 2010 +0000
corrected patches
---
patches/Makefile.diff | 46 ++++++------
patches/configure.diff | 195 ++++++-------------------------------------------
rules | 6 +-
3 files changed, 46 insertions(+), 201 deletions(-)
diff --git a/patches/Makefile.diff b/patches/Makefile.diff
index 34784fa..34f3229 100644
--- a/patches/Makefile.diff
+++ b/patches/Makefile.diff
@@ -1,33 +1,29 @@
-Index: getdp-1.2.1/Makefile
+Index: getdp-2.0.0-svn-20100125/Makefile
===================================================================
---- getdp-1.2.1.orig/Makefile 2009-09-09 11:05:05.000000000 +0200
-+++ getdp-1.2.1/Makefile 2009-09-09 11:09:06.000000000 +0200
-@@ -49,11 +49,13 @@
- ${LINKER} -o bin/getdp-box ${GETDP_LIBS}
+--- getdp-2.0.0-svn-20100125.orig/Makefile 2010-01-28 11:54:05.000000000 +0100
++++ getdp-2.0.0-svn-20100125/Makefile 2010-01-28 11:54:10.000000000 +0100
+@@ -37,11 +37,11 @@
+ @for i in ${GETDP_DIRS}; do (cd $$i && ${MAKE}); done
install: variables
-- -mkdir -p ${bindir}
-- -cp bin/getdp${EXEEXT} ${bindir}
-- -chmod 755 ${bindir}/getdp${EXEEXT}
-- -mkdir -p ${mandir}/man1
-- -cp doc/getdp.1 ${mandir}/man1
-+ -mkdir -p $(DESTDIR)${bindir}
-+ -cp bin/getdp${EXEEXT} $(DESTDIR)${bindir}
-+ -chmod 755 $(DESTDIR)${bindir}/getdp${EXEEXT}
-+ -mkdir -p $(DESTDIR)${mandir}/man1
-+ -cp doc/getdp.1 $(DESTDIR)${mandir}/man1
-+ -mkdir -p $(DESTDIR)${datadir}/demos
-+ -cp doc/getdp.1 $(DESTDIR)${datadir}/demos
+- mkdir -p ${bindir}
+- cp -f bin/getdp${EXEEXT} ${bindir}
+- chmod 755 ${bindir}/getdp${EXEEXT}
+- mkdir -p ${mandir}/man1
+- cp -f doc/getdp.1 ${mandir}/man1
++ mkdir -p $(DESTDIR)${bindir}
++ cp -f bin/getdp${EXEEXT} $(DESTDIR)${bindir}
++ chmod 755 $(DESTDIR)${bindir}/getdp${EXEEXT}
++ mkdir -p $(DESTDIR)${mandir}/man1
++ cp -f doc/getdp.1 $(DESTDIR)${mandir}/man1
variables: configure
@echo "********************************************************************"
-@@ -85,6 +87,9 @@
- for i in lib doc/texinfo ${GETDP_DIRS}; do (cd $$i && ${MAKE} clean ); done
+@@ -62,6 +62,7 @@
+ clean:
+ for i in doc lib demos ${GETDP_DIRS}; do (cd $$i && ${MAKE} clean); done
rm -f ${GETDP_VERSION_FILE}
++ rm -f bin/getdp${EXEEXT}
-+distclean:
-+ -rm -f bin/getdp${EXEEXT}
-+
- depend:
- for i in ${GETDP_DIRS};\
- do (cd $$i && ${MAKE} depend "SOLVER=-DHAVE_SPARSKIT -DHAVE_GSL");\
+ depend: initialtag
+ mv -f Common/GetDPConfig.h .
diff --git a/patches/configure.diff b/patches/configure.diff
index 12f117f..7b30347 100644
--- a/patches/configure.diff
+++ b/patches/configure.diff
@@ -1,185 +1,34 @@
-Index: getdp-1.2.1/configure.in
+Index: getdp-2.0.0/configure.in
===================================================================
---- getdp-1.2.1.orig/configure.in 2010-01-13 11:16:49.000000000 +0100
-+++ getdp-1.2.1/configure.in 2010-01-13 11:19:50.000000000 +0100
-@@ -22,6 +22,7 @@
+--- getdp-2.0.0.orig/configure.in 2010-03-18 10:21:13.000000000 +0100
++++ getdp-2.0.0/configure.in 2010-03-18 10:26:27.000000000 +0100
+@@ -6,6 +6,7 @@
dnl Process this file with autoconf to produce the configure script.
dnl Check that this is the getdp source tree
+AC_PREREQ(2.50)
- AC_INIT(Parser/GetDP.y)
+ AC_INIT(Interface/ProParser.y)
dnl Parse '--with' command-line options
-@@ -81,11 +82,11 @@
-
- dnl Check for default compilers
- AC_PROG_CC
--AC_PROG_F77
--if test "x${CC}" = "x" -o "x${F77}" = "x" ; then
-+AC_PROG_FC
-+if test "x${CC}" = "x" -o "x${FC}" = "x" ; then
- AC_MSG_ERROR([Could not find required compilers, aborting.])
- fi
--LINKER="${F77}"
-+LINKER="${FC}"
-
- dnl Take care of no-cygwin option before doing any other tests
- case "$UNAME" in
-@@ -93,7 +94,7 @@
- if test "x$enable_cygwin" != "xyes"; then
- UNAME="${UNAME}-no-cygwin"
- CC="${CC} -mno-cygwin"
-- F77="${F77} -mno-cygwin"
-+ FC="${FC} -mno-cygwin"
- LINKER="${LINKER} -mno-cygwin"
- fi
- ;;
-@@ -102,7 +103,7 @@
- dnl Set default flags
- C_FLAGS="${CFLAGS}"
- C_PARSER_FLAGS="${CFLAGS}"
--F77_FLAGS="${FFLAGS}"
-+FC_FLAGS="${FFLAGS}"
- OPTIONS=""
-
- dnl Use C for tests
-@@ -142,8 +143,7 @@
-
- if test "x$enable_arpack" != "xno"; then
- OPTIONS="${OPTIONS} -DHAVE_ARPACK"
-- GETDP_DIRS="${GETDP_DIRS} Arpack"
-- GETDP_LIBS='-Llib -lMain -lParser -lPost -lFunction -lIntegration -lGeoData -lDofData -lNumeric -lDataStr -lFMM -lArpack ${PETSC_KSP_LIB}'
-+ GETDP_LIBS='-Llib -lMain -lParser -lPost -lFunction -lIntegration -lGeoData -lDofData -lNumeric -lDataStr -lFMM -larpack ${PETSC_KSP_LIB}'
- else
- GETDP_LIBS='-Llib -lMain -lParser -lPost -lFunction -lIntegration -lGeoData -lDofData -lNumeric -lDataStr -lFMM ${PETSC_KSP_LIB}'
- fi
-@@ -178,8 +178,8 @@
- dnl Check for Arpack, then link with blas and lapack if necessary
+@@ -189,12 +190,9 @@
+ dnl Check for Arpack, then link with blas and lapack if necessary
+ if test "x$enable_fortran" != "xno"; then
if test "x$enable_arpack" != "xno" -a "x${LAPACK}" = "xyes"; then
- OPTIONS="${OPTIONS} -DHAVE_ARPACK"
-- GETDP_DIRS="${GETDP_DIRS} Arpack"
-- GETDP_LIBS="${GETDP_LIBS} -lArpack"
-+ GETDP_DIRS="${GETDP_DIRS}"
-+ GETDP_LIBS="${GETDP_LIBS} -larpack"
- fi
- if test "x${LAPACK}" = "xyes"; then
- GETDP_LIBS="${GETDP_LIBS} -llapack -lblas"
-@@ -201,9 +201,9 @@
- C_FLAGS="+O2 +Onolimit -Ae +DAportable"
- C_PARSER_FLAGS="+O1 -Ae +DAportable"
- fi
-- if test "x${F77}" = "xf77"; then
-- F77_FLAGS="+O2 +DAportable"
-- LINKER="f77 +DAportable"
-+ if test "x${FC}" = "xf90"; then
-+ FC_FLAGS="+O2 +DAportable"
-+ LINKER="f90 +DAportable"
- GETDP_LIBS="Main/Main.o ${GETDP_LIBS}"
- SOLVER="-DHAVE_UNDERSCORE ${SOLVER}"
- fi
-@@ -213,8 +213,8 @@
- if test "x${CC}" = "xcc"; then
- C_PARSER_FLAGS="-O1"
+- AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
+- if test "x${ARPACK}" = "xyes"; then
+ AC_DEFINE(HAVE_ARPACK)
+ BO="${BO} Arpack"
+- GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
+- GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
++ GETDP_LIBS="${GETDP_LIBS} -larpack"
+ if test "x${SPARSKIT}" = "xyes"; then
+ if test "x${BLAS_LAPACK_PREFIX}" != "x"; then
+ GETDP_LIBS="${GETDP_LIBS} -L${BLAS_LAPACK_PREFIX} -llapack -lblas"
+@@ -202,7 +200,6 @@
+ GETDP_LIBS="${GETDP_LIBS} -llapack -lblas"
+ fi
fi
-- if test "x${F77}" = "xf77"; then
-- LINKER="f77 -nofor_main"
-+ if test "x${FC}" = "xf90"; then
-+ LINKER="f90 -nofor_main"
- fi
- ;;
- SunOS*)
-@@ -226,8 +226,8 @@
- C_FLAGS="-O2 -D_BSD -qMAXMEM=10000"
- C_PARSER_FLAGS="-O1 -D_BSD -qMAXMEM=10000"
- fi
-- if test "x${F77}" = "xf77"; then
-- F77_FLAGS="-O2 -D_BSD -qMAXMEM=10000"
-+ if test "x${FC}" = "xf90"; then
-+ FC_FLAGS="-O2 -D_BSD -qMAXMEM=10000"
- SOLVER="-DHAVE_SPARSKIT -DHAVE_UNDERSCORE"
- fi
- ;;
-@@ -238,13 +238,13 @@
- ;;
- Linux*)
- dnl options for pgi and intel compilers
-- case "${F77}" in
-- *pgf77*)
-- LINKER="${F77} -Mnomain"
-+ case "${FC}" in
-+ *pgf90*)
-+ LINKER="${FC} -Mnomain"
- GETDP_LIBS="Main/Main.o ${GETDP_LIBS}"
- ;;
- *ifort*)
-- LINKER="${F77} -nofor_main"
-+ LINKER="${FC} -nofor_main"
- ;;
- esac
- ;;
-@@ -319,6 +319,10 @@
- if test "x${METIS_PREFIX}" != "x"; then
- OPTIONS="${OPTIONS} -I${METIS_PREFIX} -I${METIS_PREFIX}/include"
- GETDP_LIBS="${GETDP_LIBS} -L${METIS_PREFIX} -L${METIS_PREFIX}/lib -lmetis"
-+ else
-+ dnl options for scotchmetis
-+ OPTIONS="${OPTIONS} -I/usr/include/metis"
-+ GETDP_LIBS="${GETDP_LIBS} -lscotchmetis -lmetis -lscotch"
+- fi
fi
fi
-@@ -368,7 +372,7 @@
- AC_SUBST(UNAME)
- AC_SUBST(C_FLAGS)
- AC_SUBST(C_PARSER_FLAGS)
--AC_SUBST(F77_FLAGS)
-+AC_SUBST(FC_FLAGS)
- AC_SUBST(SOLVER)
- AC_SUBST(LINKER)
- AC_SUBST(GETDP_DIRS)
-@@ -384,7 +388,7 @@
- echo "GetDP is configured for"
- echo "- OS : $UNAME"
- echo "- C compiler : $CC $C_FLAGS"
--echo "- Fortran compiler : $F77 $F77_FLAGS"
-+echo "- Fortran compiler : $FC $FC_FLAGS"
- echo "- Linker : $LINKER"
- echo "- Solver : $SOLVER"
- if test "x$enable_petsc" = "xyes"; then
-Index: getdp-1.2.1/variables.in
-===================================================================
---- getdp-1.2.1.orig/variables.in 2010-01-13 11:16:49.000000000 +0100
-+++ getdp-1.2.1/variables.in 2010-01-13 11:16:55.000000000 +0100
-@@ -24,7 +24,7 @@
-
- # The names of the C and Fortran compilers
- CC=@CC@
--F77=@F77@
-+FC=@FC@
-
- # If you need to link to dynamic libraries installed in non-standard
- # locations and are using the GNU linker, you may want to add
-@@ -36,7 +36,7 @@
- # Compiler flags
- C_FLAGS=@C_FLAGS@
- C_PARSER_FLAGS=@C_PARSER_FLAGS@
--F77_FLAGS=@F77_FLAGS@
-+FC_FLAGS=@FC_FLAGS@
-
- # GetDP subdirectories and libraries
- GETDP_DIRS=@GETDP_DIRS@
-Index: getdp-1.2.1/Makefile
-===================================================================
---- getdp-1.2.1.orig/Makefile 2010-01-13 11:16:55.000000000 +0100
-+++ getdp-1.2.1/Makefile 2010-01-13 11:16:55.000000000 +0100
-@@ -54,8 +54,8 @@
- -chmod 755 $(DESTDIR)${bindir}/getdp${EXEEXT}
- -mkdir -p $(DESTDIR)${mandir}/man1
- -cp doc/getdp.1 $(DESTDIR)${mandir}/man1
-- -mkdir -p $(DESTDIR)${datadir}/demos
-- -cp doc/getdp.1 $(DESTDIR)${datadir}/demos
-+ -mkdir -p $(DESTDIR)${datadir}/getdp/demos
-+ -cp demos/* $(DESTDIR)${datadir}/getdp/demos
-
- variables: configure
- @echo "********************************************************************"
diff --git a/rules b/rules
index 587b1bb..f0b23ac 100755
--- a/rules
+++ b/rules
@@ -2,8 +2,8 @@
DEB_AUTO_CLEANUP_RCS := yes
-#DEB_AUTO_UPDATE_ACLOCAL := 1.11
-#DEB_AUTO_UPDATE_AUTOCONF := 1
+DEB_AUTO_UPDATE_ACLOCAL := 1.11
+DEB_AUTO_UPDATE_AUTOCONF := 1
DEB_COMPRESS_EXCLUDE := .pdf .svn
@@ -11,7 +11,6 @@ include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
# PETSC_DIR is the location of PETSc.
export PETSC_DIR=/usr/lib/petscdir/3.1
export PETSC_ARCH=linux-gnu-c-opt
@@ -27,6 +26,7 @@ clean::
find . \( -name "*.o" -o -name "*.a" \) -delete
rm -rf bin/getdp
rm -rf include/GetDPVersion.h
+ rm -rf variables configure
rm -rf config.guess config.sub config.status config.log
.PHONY: get-orig-source
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getdp.git
More information about the debian-science-commits
mailing list