add patch flags for recipes, set pyasn1 dependency

gabriel pettier · gabriel pettier · commit ad77f62c6855 · 2015-11-08T14:49:51.000+01:00
diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_gnutls=3.3.16
-DEPS_gnutls=(nettle)
+DEPS_gnutls=(nettle pyasn1)
 URL_gnutls=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${VERSION_gnutls}.tar.xz
 BUILD_gnutls=$BUILD_PATH/gnutls/$(get_directory $URL_gnutls)
 RECIPE_gnutls=$RECIPES_PATH/gnutls
diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh
@@ -10,8 +10,12 @@ _src=$BUILD_nettle
 
 function prebuild_nettle() {
 	cd $_src
-	try patch -p1 < $RECIPE_nettle/configure.patch
-	true
+	if [ ! -e $RECIPE_nettle/patched ]; then
+	do
+		try patch -p1 < $RECIPE_nettle/configure.patch
+		touch $RECIPE_nettle/patched
+	done
+	fi
 }
 
 function shouldbuild_nettle() {
diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh
@@ -14,8 +14,13 @@ _pyroot=$(dirname `dirname $HOSTPYTHON`)
 function prebuild_task() {
 	# take the patch from the recipe
 	cd $BUILD_task
-	patch -p1 < $RECIPE_task/CMakeLists.txt.patch
-	patch -p1 < $RECIPE_task/Nibbler.h.patch
+	if [ ! -e $RECIPE_task/patched ]; then
+	do
+		patch --forward -p1 < $RECIPE_task/CMakeLists.txt.patch
+		patch --forward -p1 < $RECIPE_task/Nibbler.h.patch
+		touch $RECIPE_task/patched
+	done
+	fi
 
 	cp $RECIPE_task/glob.* $BUILD_task/src
 
