patch: --forward || true; added additional || true to make the result of patch (in...

diff --git a/DTM++.toolbox/packages/superlu_dist.package b/DTM++.toolbox/packages/superlu_dist.package
index 6f9997de3baef3c863a21ae040f1a8d954bc93a4..c730ca0b258e2649ce05490818672becb222b2fb 100644 (file)
--- a/DTM++.toolbox/packages/superlu_dist.package
+++ b/DTM++.toolbox/packages/superlu_dist.package
@@ -9,7 +9,7 @@ BUILDCHAIN=custom
 package_specific_build() {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
 
-    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch
+    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch || true
 
     mv make.inc make.inc.bak
     #create make.inc

diff --git a/DTM++.toolbox/packages/trilinos.package b/DTM++.toolbox/packages/trilinos.package
index c405978c3d241fe3c94064df1ea481884cf8b9f1..4c4fff7e29301db03d20e389b69dd68ca3cf9245 100644 (file)
--- a/DTM++.toolbox/packages/trilinos.package
+++ b/DTM++.toolbox/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 --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch
+    patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch || true
 }
 
 package_specific_register () {

diff --git a/deal.II/packages/superlu_dist.package b/deal.II/packages/superlu_dist.package
index 6f9997de3baef3c863a21ae040f1a8d954bc93a4..c730ca0b258e2649ce05490818672becb222b2fb 100644 (file)
--- 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 --forward < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch
+    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch || true
 
     mv make.inc make.inc.bak
     #create make.inc

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index c405978c3d241fe3c94064df1ea481884cf8b9f1..4c4fff7e29301db03d20e389b69dd68ca3cf9245 100644 (file)
--- 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 --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch
+    patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch || true
 }
 
 package_specific_register () {