Don't fail so hard the second time you compile.

clayote · clayote · commit c3b1f64ff9db · 2014-02-13T09:52:15.000-05:00
diff --git a/recipes/c_igraph/recipe.sh b/recipes/c_igraph/recipe.sh
@@ -32,15 +32,15 @@ function build_c_igraph() {
     cd $BUILD_c_igraph
 
     push_arm
-    try patch $BUILD_c_igraph/src/Makefile.am $RECIPE_c_igraph/Makefile.am.patch
+    patch -Nr - $BUILD_c_igraph/src/Makefile.am $RECIPE_c_igraph/Makefile.am.patch
     export OLD_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS -I$ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/4.4.3/include -I$ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/4.4.3/libs/armeabi/include -L$ANDROIDNDK/platforms/android-$ANDROIDAPI/arch-arm/usr/lib"
     try ./configure --prefix="$BUILD_PATH/python-install" --build=i686-pc-linux-gnu --host=arm-linux-eabi
     export CPPFLAGS="$OLD_CPPFLAGS"
-    try cp -f $RECIPE_c_igraph/arith.h $BUILD_c_igraph/src/f2c/arith.h
-    try patch $BUILD_c_igraph/src/f2c/sysdep1.h $RECIPE_c_igraph/sysdep1.h.patch
-    try patch $BUILD_c_igraph/src/f2c/uninit.c $RECIPE_c_igraph/uninit.c.patch
-    try patch $BUILD_c_igraph/config.h $RECIPE_c_igraph/config.h.patch
+    cp -f $RECIPE_c_igraph/arith.h $BUILD_c_igraph/src/f2c/arith.h
+    patch -Nr - $BUILD_c_igraph/src/f2c/sysdep1.h $RECIPE_c_igraph/sysdep1.h.patch
+    patch -Nr - $BUILD_c_igraph/src/f2c/uninit.c $RECIPE_c_igraph/uninit.c.patch
+    patch -N $BUILD_c_igraph/config.h $RECIPE_c_igraph/config.h.patch
     try $MAKE
     try $MAKE install
 
diff --git a/recipes/igraph/recipe.sh b/recipes/igraph/recipe.sh
@@ -18,8 +18,8 @@ RECIPE_igraph=$RECIPES_PATH/igraph
 
 
 function prebuild_igraph() {
-    try patch $BUILD_igraph/setup.py $RECIPE_igraph/setup.py.patch
-    try patch $BUILD_igraph/setup.cfg $RECIPE_igraph/setup.cfg.patch
+    patch -Nr - $BUILD_igraph/setup.py $RECIPE_igraph/setup.py.patch
+    patch -Nr - $BUILD_igraph/setup.cfg $RECIPE_igraph/setup.cfg.patch
 }
 
 function shouldbuild_igraph() {

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ RECIPE_igraph=$RECIPES_PATH/igraph`
`18`	`18`
`19`	`19`
`20`	`20`	`function prebuild_igraph() {`
`21`		`- try patch $BUILD_igraph/setup.py $RECIPE_igraph/setup.py.patch`
`22`		`- try patch $BUILD_igraph/setup.cfg $RECIPE_igraph/setup.cfg.patch`
	`21`	`+ patch -Nr - $BUILD_igraph/setup.py $RECIPE_igraph/setup.py.patch`
	`22`	`+ patch -Nr - $BUILD_igraph/setup.cfg $RECIPE_igraph/setup.cfg.patch`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`function shouldbuild_igraph() {`