Skip to contentSkip to conversation

Qt3 rebuild fix

PATCH Applied Paul Eggleton 2 participants 3 messages Apr 3, 2012

lore
Share & tools
lore
#0 lore raw

cover Qt3 rebuild fix

The following change since commit a1c72ecf80c0ded21709aa667c41d65399e4439f:

qt-x11-free: fix QA errors (2012-03-14 17:35:09 +0000)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/qt3-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/qt3-fix

Paul Eggleton (1):
qt-x11-free: fix build failure in do_configure

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

PATCH 1/1 qt-x11-free: fix build failure in do_configure

This line appears to be superfluous and was failing if Makefile did not exist.

---
 recipes-qt3/qt3/qt-x11-free-common.inc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
recipes-qt3/qt3/qt-x11-free-common.inc +1 -2
index b3c2dbf..1ab14a2 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application
 SECTION = "x11/libs"
 LICENSE = "GPLv2 | QPL-1.0"
 HOMEPAGE = "http://www.trolltech.com"
-INC_PR = "r5"
+INC_PR = "r6"
 
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
@@ -32,7 +32,6 @@ do_configure() {
 
 	# force regenerate
 	rm -f src/qtmain.pro
-	cat Makefile >makefile
 	find . -name "Makefile"|xargs rm -f
 	(cd src && ${OE_QMAKE_QMAKE} -spec ${QMAKESPEC} )
 	(cd plugins/src && ${OE_QMAKE_QMAKE} -spec ${QMAKESPEC} )
Signature · 1 line
1.7.5.4
Applied
#2 lore raw
In reply to Paul Eggleton
Quoted 8 lines · Paul Eggleton

The following change since commit a1c72ecf80c0ded21709aa667c41d65399e4439f:

   qt-x11-free: fix QA errors (2012-03-14 17:35:09 +0000)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/qt3-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/qt3-fix

Quoted 6 lines

Paul Eggleton (1):
qt-x11-free: fix build failure in do_configure

  recipes-qt3/qt3/qt-x11-free-common.inc |    3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)

Merged into meta-qt3

Thanks
Sau!