Skip to contentSkip to conversation

Fix Qt3 Build issues

PATCH New Saul Wold 1 participant 3 messages Sep 14, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Fix Qt3 Build issues

This fixes some build issues in Qt3

The following changes since commit 45416a04123a46ce0a35c6b9286bf53f2f8ce257:

qt3: Stop TARGET_OS differences causing build failures (2011-08-15 15:33:49 +0100)

are available in the git repository at:
git://git.yoctoproject.org/meta-qt3 stage/rc2
http://git.yoctoproject.org/cgit.cgi/meta-qt3/log/?h=stage/rc2

Saul Wold (2):
qt-x11-free-common: allow BBPATH to find qt3x11
qt-x11-free-native: fix where qmake gets linked

 recipes-qt3/qt3/qt-x11-free-common.inc      |    2 +-
 recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/2 qt-x11-free-common: allow BBPATH to find qt3x11

Signed-off-by Saul Wold <[email protected]>
---
 recipes-qt3/qt3/qt-x11-free-common.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes-qt3/qt3/qt-x11-free-common.inc +1 -1
index 9e6cc81..6aa6306 100644
@@ -8,7 +8,7 @@ PR = "r1"
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
 
-inherit qmake_base ${COREBASE}/meta-qt3/classes/qt3x11.bbclass
+inherit qmake_base qt3x11
 
 export QTDIR = "${S}"
 STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/2 qt-x11-free-native: fix where qmake gets linked

In reply to Saul Wold

[YOCTO #1484]

qmake was getting linked in the sysroot directory to the build area and this was being picked up by sstate. Change how the symbolic link is created

Signed-off-by Saul Wold <[email protected]>
---
 recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb +2 -2
index e64256f..779513e 100644
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL | QPL"
 DEPENDS = "xmu-native"
 HOMEPAGE = "http://www.trolltech.com"
-PR = "r0"
+PR = "r1"
 
 PROVIDES += "qt-x11-free-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"

@@ -58,7 +58,7 @@ do_install() {
     install -d ${D}${datadir}/qt3/
     cp -PfR mkspecs ${D}${datadir}/qt3/
     ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${TARGET_OS}-oe-g++
-    ln -s ${D}${datadir}/qt3/mkspecs/ ${D}${datadir}/qmake
+    ln -sf qt3/mkspecs ${D}${datadir}/qmake
     install -d ${D}${libdir}/
     oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
     cd ${D}${bindir}
Signature · 1 line
1.7.6