[oe] [PATCH 2/2] libsdl-image: moved task to do_configure_prepend changed rm into rm -f

[Khem Raj]

On Fri, Dec 24, 2010 at 12:03 AM, Frans Meulenbroeks
<fransmeulenbroeks at gmail.com> wrote:
> - 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 at gmail.com>

Acked-by: Khem Raj <raj.khem at gmail.com

> ---
>  recipes/libsdl/libsdl-image_1.2.10.bb |   18 ++++++++----------
>  recipes/libsdl/libsdl-image_1.2.6.bb  |    8 +++-----
>  2 files changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/recipes/libsdl/libsdl-image_1.2.10.bb b/recipes/libsdl/libsdl-image_1.2.10.bb
> index 98a4e83..7f7f5ee 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 b014275..46d7924 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"
> --
> 1.7.1
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>