[oe-commits] org.oe.dev uicmoc4-native.inc : fix bug #3650 by actually passing LDFLAGS to

[xora commit]

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.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 79d45e73d2895ffcdc7d64585b097a492ffdd6d9
ViewMTN: http://monotone.openembedded.org/revision/info/79d45e73d2895ffcdc7d64585b097a492ffdd6d9
Files:
1
packages/uicmoc/files
packages/uicmoc/files/configure-fix.patch
packages/uicmoc/uicmoc4-native.inc
Diffs:

#
# mt diff -r14cc6e5539bbdc026ec0c1854ce3842d33a4aa35 -r79d45e73d2895ffcdc7d64585b097a492ffdd6d9
#
# 
# 
# add_dir "packages/uicmoc/files"
# 
# add_file "packages/uicmoc/files/configure-fix.patch"
#  content [84bc145dd2c490117c1f87e3171b69a2cf2dfbd3]
# 
# patch "packages/uicmoc/uicmoc4-native.inc"
#  from [6886688b3df896b25e7d22c296b444e6c7704bd2]
#    to [2b219b305e2d05b7f9dbe7ec53cdaf102d217a18]
# 
============================================================
--- packages/uicmoc/files/configure-fix.patch	84bc145dd2c490117c1f87e3171b69a2cf2dfbd3
+++ packages/uicmoc/files/configure-fix.patch	84bc145dd2c490117c1f87e3171b69a2cf2dfbd3
@@ -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
============================================================
--- packages/uicmoc/uicmoc4-native.inc	6886688b3df896b25e7d22c296b444e6c7704bd2
+++ packages/uicmoc/uicmoc4-native.inc	2b219b305e2d05b7f9dbe7ec53cdaf102d217a18
@@ -6,7 +6,8 @@ PR = "r0"
 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_OEMAKE = " "
 # 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}"