From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Fri, 11 Jul 2014 07:43:03 +0000 (+0200)
Subject: patch: added --forward option to reapply patch with no user requests
X-Git-Tag: v0.4~81
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27406d0720f75ffc45c53dd6e7c4efc016f6f70a;p=candi.git

patch: added --forward option to reapply patch with no user requests
---

diff --git a/DTM++.toolbox/packages/superlu_dist.package b/DTM++.toolbox/packages/superlu_dist.package
index 24dc635..6f9997d 100644
--- a/DTM++.toolbox/packages/superlu_dist.package
+++ b/DTM++.toolbox/packages/superlu_dist.package
@@ -4,14 +4,13 @@ EXTRACTSTO=SuperLU_DIST_${VERSION}
 SOURCE=http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
 PACKING=.tar.gz
 CHECKSUM=f4805659157d93a962500902c219046b
-#1d77f10a265f5751d4e4b59317d778f8  superlu_dist_3.0.tar.gz
-#5b114d6f97d9e94d643f51bb3c6cf03f  superlu_dist_3.1.tar.gz
-#b67bab5bb1ee92d38ad6c345b3c2b18d  superlu_dist_3.2.tar.gz
-#f4805659157d93a962500902c219046b  superlu_dist_3.3.tar.gz
 BUILDCHAIN=custom
 
 package_specific_build() {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
+
+    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch
+
     mv make.inc make.inc.bak
     #create make.inc
 echo "#  The machine (platform) identifier to append to the library names
@@ -22,7 +21,9 @@ PLAT            = _x86_64
 #  The name of the libraries to be created/linked to
 #
 DSuperLUroot    = ${INSTALL_PATH}
-DSUPERLULIB     = \$(DSuperLUroot)/lib/libsuperlu_dist_${VERSION}.a
+DSUPERLULIBNAME = libsuperlu_dist
+DSUPERLULIBDIR  = \$(DSuperLUroot)/lib
+DSUPERLULIB     = \$(DSUPERLULIBDIR)/\$(DSUPERLULIBNAME)
 
 #
 BLASDEF         = -DUSE_VENDOR_BLAS
@@ -70,8 +71,6 @@ CDEFS        = -DAdd_
 
     # now compile superlu_dist
     make superlulib
-    rm -f ${INSTALL_PATH}/lib/libsuperlu_dist.a
-    ln -s ${INSTALL_PATH}/lib/libsuperlu_dist_${VERSION}.a ${INSTALL_PATH}/lib/libsuperlu_dist.a
     mkdir -p ${INSTALL_PATH}/include/superlu
     cp SRC/*.h ${INSTALL_PATH}/include/superlu
 }
diff --git a/DTM++.toolbox/packages/trilinos.package b/DTM++.toolbox/packages/trilinos.package
index 476c5e8..c405978 100644
--- a/DTM++.toolbox/packages/trilinos.package
+++ b/DTM++.toolbox/packages/trilinos.package
@@ -13,7 +13,7 @@ CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \
           -D TPL_ENABLE_ParMETIS:BOOL=ON \
           -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so \
           -D TPL_ENABLE_SuperLUDist:BOOL=ON \
-          -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist_3.3.a \
+          -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist.so \
           -D SuperLUDist_INCLUDE_DIRS:PATH=${INSTALL_PATH}/include/superlu \
           -D CMAKE_BUILD_TYPE:STRING=RELEASE \
           -D CMAKE_CXX_FLAGS:STRING=-fPIC -g -O3 \
@@ -28,7 +28,7 @@ CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \
 package_specific_setup() {
     # Apply patch to let Trilinos/Amesos work with SuperLUDist_3.3
     cd ${UNPACK_PATH}/${EXTRACTSTO}/packages/amesos/src
-    patch Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch
+    patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch
 }
 
 package_specific_register () {
diff --git a/deal.II/packages/superlu_dist.package b/deal.II/packages/superlu_dist.package
index 97252b1..6f9997d 100644
--- a/deal.II/packages/superlu_dist.package
+++ b/deal.II/packages/superlu_dist.package
@@ -9,7 +9,7 @@ BUILDCHAIN=custom
 package_specific_build() {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
 
-    patch -p1 < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch
+    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch
 
     mv make.inc make.inc.bak
     #create make.inc
diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index 40318d5..c405978 100644
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -28,7 +28,7 @@ CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \
 package_specific_setup() {
     # Apply patch to let Trilinos/Amesos work with SuperLUDist_3.3
     cd ${UNPACK_PATH}/${EXTRACTSTO}/packages/amesos/src
-    patch Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch
+    patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch
 }
 
 package_specific_register () {