From b4b463a95242c1b7d9889708d6f918219c5c2e9e Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 14 Jan 2008 09:22:28 +0000
Subject: uicmoc4-native.inc : fix bug #3650 by actually passing LDFLAGS to
 configure. Trolltech calls this var LFLAGS but sucks in LDFLAGS from
 environment. So our staging directory is never seen.

---
 packages/uicmoc/files/.mtn2git_empty      |  0
 packages/uicmoc/files/configure-fix.patch | 13 +++++++++++++
 packages/uicmoc/uicmoc4-native.inc        |  5 ++++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/uicmoc/files/.mtn2git_empty
 create mode 100644 packages/uicmoc/files/configure-fix.patch

(limited to 'packages/uicmoc')

diff --git a/packages/uicmoc/files/.mtn2git_empty b/packages/uicmoc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/uicmoc/files/configure-fix.patch b/packages/uicmoc/files/configure-fix.patch
new file mode 100644
index 0000000000..df195494ee
--- /dev/null
+++ b/packages/uicmoc/files/configure-fix.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/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc
index 298c103fb1..5313b90ee9 100644
--- a/packages/uicmoc/uicmoc4-native.inc
+++ b/packages/uicmoc/uicmoc4-native.inc
@@ -6,7 +6,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 PR = "r0"
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+           file://configure-fix.patch;patch=1"
 S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
 
 inherit native
@@ -26,6 +27,8 @@ EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
 # yank default -e
 EXTRA_OEMAKE = " "
 
+export LFLAGS="${LDFLAGS}"
+
 do_configure() {
     sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
     echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-- 
cgit v1.2.3