summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-04-23 13:39:23 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-04-23 13:39:23 +0000
commit754bd0eacd58c13a8877b3fbc60df3c326439159 (patch)
tree6a2ad2bdc99cf41e764c28f5f423816fb5e33f2d
parentf20b10080fcdad1c44f11d471023b88ff5802590 (diff)
apply a patch to fix a bug in the QtE 2.3.7 makefile
which lead to always including the system zlib and png headers even when -qt-zlib and -qt-libpng was specified BKrev: 40891c8blb5MZmT3y8DnlS3eNSggag
-rw-r--r--uicmoc/uicmoc-native-2.3.7/fix-makefile.patch0
-rw-r--r--uicmoc/uicmoc-native_2.3.7.oe6
2 files changed, 4 insertions, 2 deletions
diff --git a/uicmoc/uicmoc-native-2.3.7/fix-makefile.patch b/uicmoc/uicmoc-native-2.3.7/fix-makefile.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/uicmoc/uicmoc-native-2.3.7/fix-makefile.patch
diff --git a/uicmoc/uicmoc-native_2.3.7.oe b/uicmoc/uicmoc-native_2.3.7.oe
index edb68a6dc0..d3d61edaad 100644
--- a/uicmoc/uicmoc-native_2.3.7.oe
+++ b/uicmoc/uicmoc-native_2.3.7.oe
@@ -1,9 +1,10 @@
DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
+SECTION = "tools"
PRIORITY = "optional"
-DEPENDS = "virtual/libc zlib-native"
LICENSE = "GPL/QPL"
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
+ file://${FILESDIR}/fix-makefile.patch;patch=1"
S = "${WORKDIR}/qt-${PV}"
inherit autotools native
@@ -26,6 +27,7 @@ do_configure() {
do_compile() {
unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
+ oe_runmake symlinks || die "Can't symlink include files"
cd ${S}/src/moc && oe_runmake || die "Building moc failed"
cp ${S}/src/moc/moc ${S}/bin
cd ${S}/src && oe_runmake || die "Building libqt.a failed"