From 1f33a4f0f1b47a226e76b07b8a4faff81ea82b10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Fri, 11 Jul 2014 10:55:03 +0200 Subject: [PATCH] patch: --forward || true; added additional || true to make the result of patch (in the case that the code was patched before) true/no error --- DTM++.toolbox/packages/superlu_dist.package | 2 +- DTM++.toolbox/packages/trilinos.package | 2 +- deal.II/packages/superlu_dist.package | 2 +- deal.II/packages/trilinos.package | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DTM++.toolbox/packages/superlu_dist.package b/DTM++.toolbox/packages/superlu_dist.package index 6f9997d..c730ca0 100644 --- 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 c405978..4c4fff7 100644 --- 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 6f9997d..c730ca0 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 --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 c405978..4c4fff7 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 --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 () { -- 2.39.5