diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-09-14 13:40:50 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-09-14 13:41:06 -0700 |
| commit | 0e9784d26df51bd564b8f23bd40a6c36969abd5c (patch) | |
| tree | 45c78e2cc46807454ab9058b8bf30ee9d7719b34 | |
| parent | 152a29e8c66bc359ba09d252272e3376a931b100 (diff) | |
| download | meta-qt3-1.1_M4.tar.gz | |
qt-x11-free-native: fix where qmake gets linkededison-6.01.2_M1.rc11.1_M4.rc41.1_M4.rc2+stage/rc21.1_M4
[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 <sgw@linux.intel.com>
| -rw-r--r-- | recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb index e64256f..779513e 100644 --- a/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb +++ b/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | |||
| @@ -4,7 +4,7 @@ PRIORITY = "optional" | |||
| 4 | LICENSE = "GPL | QPL" | 4 | LICENSE = "GPL | QPL" |
| 5 | DEPENDS = "xmu-native" | 5 | DEPENDS = "xmu-native" |
| 6 | HOMEPAGE = "http://www.trolltech.com" | 6 | HOMEPAGE = "http://www.trolltech.com" |
| 7 | PR = "r0" | 7 | PR = "r1" |
| 8 | 8 | ||
| 9 | PROVIDES += "qt-x11-free-native" | 9 | PROVIDES += "qt-x11-free-native" |
| 10 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free" | 10 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free" |
| @@ -58,7 +58,7 @@ do_install() { | |||
| 58 | install -d ${D}${datadir}/qt3/ | 58 | install -d ${D}${datadir}/qt3/ |
| 59 | cp -PfR mkspecs ${D}${datadir}/qt3/ | 59 | cp -PfR mkspecs ${D}${datadir}/qt3/ |
| 60 | ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${TARGET_OS}-oe-g++ | 60 | ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${TARGET_OS}-oe-g++ |
| 61 | ln -s ${D}${datadir}/qt3/mkspecs/ ${D}${datadir}/qmake | 61 | ln -sf qt3/mkspecs ${D}${datadir}/qmake |
| 62 | install -d ${D}${libdir}/ | 62 | install -d ${D}${libdir}/ |
| 63 | oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ | 63 | oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ |
| 64 | cd ${D}${bindir} | 64 | cd ${D}${bindir} |
