[oe] [STABLE][PATCH] qt4-tools-native: set LFLAGS to pick up zlib from staging

[Koen Kooi]

On 03-04-09 07:39, Jeremy Lainé wrote:
> From: Jeremy Lainé<jeremy.laine at m4x.org>

Acked-by: Koen Kooi <koen at openembedded.org>


>
>
> Signed-off-by: Jeremy Lainé<jeremy.laine at m4x.org>
> ---
>   recipes/qt4/files/configure-lflags.patch |   13 +++++++++++++
>   recipes/qt4/qt4-tools-native.inc         |    3 ++-
>   recipes/qt4/qt4-tools-native_4.4.3.bb    |    2 +-
>   recipes/qt4/qt4-tools-native_4.5.0.bb    |    2 +-
>   4 files changed, 17 insertions(+), 3 deletions(-)
>   create mode 100644 recipes/qt4/files/configure-lflags.patch
>
> diff --git a/recipes/qt4/files/configure-lflags.patch b/recipes/qt4/files/configure-lflags.patch
> new file mode 100644
> index 0000000..df19549
> --- /dev/null
> +++ b/recipes/qt4/files/configure-lflags.patch
> @@ -0,0 +1,13 @@
> +Index: qtopia-core-opensource-src-4.3.3/configure
> +===================================================================
> +--- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-14 08:53:51.000000000 +0000
> ++++ qtopia-core-opensource-src-4.3.3/configure	2008-01-14 08:54:07.000000000 +0000
> +@@ -447,7 +447,7 @@
> + # initalize variables
> + #-------------------------------------------------------------------------------
> +
> +-SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
> ++SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
> + for varname in $SYSTEM_VARIABLES; do
> +     cmd=`echo \
> + 'if [ -n "\$'${varname}'" ]; then
> diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
> index fe2f94a..df5afd3 100644
> --- a/recipes/qt4/qt4-tools-native.inc
> +++ b/recipes/qt4/qt4-tools-native.inc
> @@ -8,6 +8,7 @@ LICENSE = "GPL"
>   inherit native
>
>   SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
> +           file://configure-lflags.patch;patch=1 \
>              file://qt-config.patch;patch=1 \
>              file://g++.conf \
>              file://linux.conf"
> @@ -29,7 +30,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
>   EXTRA_OEMAKE = " "
>
>   do_configure() {
> -    echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
> +    echo yes | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
>   }
>
>   TOBUILD = "\
> diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
> index 8a8d46f..ef86db4 100644
> --- a/recipes/qt4/qt4-tools-native_4.4.3.bb
> +++ b/recipes/qt4/qt4-tools-native_4.4.3.bb
> @@ -1,2 +1,2 @@
>   require qt4-tools-native.inc
> -PR = "r2"
> +PR = "r3"
> diff --git a/recipes/qt4/qt4-tools-native_4.5.0.bb b/recipes/qt4/qt4-tools-native_4.5.0.bb
> index 6e5474b..ab63314 100644
> --- a/recipes/qt4/qt4-tools-native_4.5.0.bb
> +++ b/recipes/qt4/qt4-tools-native_4.5.0.bb
> @@ -1,5 +1,5 @@
>   require qt4-tools-native.inc
> -PR = "r0"
> +PR = "r1"
>
>   DEFAULT_PREFERENCE = "-1"
>   TOBUILD := "src/tools/bootstrap ${TOBUILD}"