From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Fri, 24 Dec 2010 07:52:53 +0000 (+0100)
Subject: libsdl-image: moved task to do_configure_prepend changed rm into rm -f
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94506307ba6b39b2960c3304f0712d9fd810184f;p=openembedded.git

libsdl-image: moved task to do_configure_prepend changed rm into rm -f

- less tasks makes it slighly faster
- other recipes also do this in do_configure_prepend or do_configure
- rm -f avoid error of file dues not exist (e.g. because the task is ran twice)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---

diff --git a/recipes/libsdl/libsdl-image_1.2.10.bb b/recipes/libsdl/libsdl-image_1.2.10.bb
index 98a4e83aea..7f7f5ee114 100644
--- a/recipes/libsdl/libsdl-image_1.2.10.bb
+++ b/recipes/libsdl/libsdl-image_1.2.10.bb
@@ -7,18 +7,16 @@ DEPENDS += "tiff"
 # Disable the run-time loading of the libs and bring back the soname dependencies.
 EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
 
-do_unpackpost() {
+do_configure_prepend() {
 	# Removing this file fixes a libtool version mismatch.
-	rm acinclude/libtool.m4
-	rm acinclude/sdl.m4
-	rm acinclude/pkg.m4
-	rm acinclude/lt~obsolete.m4
-	rm acinclude/ltoptions.m4
-	rm acinclude/ltsugar.m4
-	rm acinclude/ltversion.m4
+	rm -f acinclude/libtool.m4
+	rm -f acinclude/sdl.m4
+	rm -f acinclude/pkg.m4
+	rm -f acinclude/lt~obsolete.m4
+	rm -f acinclude/ltoptions.m4
+	rm -f acinclude/ltsugar.m4
+	rm -f acinclude/ltversion.m4
 }
 
-addtask unpackpost after do_unpack before do_patch
-
 SRC_URI[md5sum] = "6c06584b31559e2b59f2b982d0d1f628"
 SRC_URI[sha256sum] = "75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876"
diff --git a/recipes/libsdl/libsdl-image_1.2.6.bb b/recipes/libsdl/libsdl-image_1.2.6.bb
index b014275329..46d7924ab7 100644
--- a/recipes/libsdl/libsdl-image_1.2.6.bb
+++ b/recipes/libsdl/libsdl-image_1.2.6.bb
@@ -4,13 +4,11 @@ PR = "${INC_PR}.1"
 
 DEPENDS += "tiff"
 
-do_unpackpost() {
+do_configure_prepend() {
 	# Removing this file fixes a libtool version mismatch.
-	rm acinclude/libtool.m4
-	rm acinclude/sdl.m4
+	rm -f acinclude/libtool.m4
+	rm -f acinclude/sdl.m4
 }
 
-addtask unpackpost after do_unpack before do_patch
-
 SRC_URI[md5sum] = "b866dc4f647517bdaf57f6ffdefd013e"
 SRC_URI[sha256sum] = "88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4"