Hi Here's the second try. I forgot to change the rules for qt host. It still has problems to find the right moc now?
My guesses are that it either doesn't interpret the ptx makespec which is patched in or that the path to the moc in the makespec is wrong or the QT_INSTALL_BINS variable is not set up correctly. It could also that the makespec is not used... Hopefully attaching the patches is ok? I hope to get rid of whitespace errrors this way... Best regards Tim
diff --git a/patches/qt-everywhere-opensource-src-4.6.2/ptx-mkspec.diff b/patches/qt-everywhere-opensource-src-4.6.2/ptx-mkspec.diff new file mode 100644 index 0000000..e09b183 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.2/ptx-mkspec.diff @@ -0,0 +1,114 @@ +Subject: mkspec for ptxdist +From: Michael Olbrich <[email protected]> + +Add a mkspec for ptxdist: +- qplatformdefs.h + Include the generic qplatformdefs.h +- qmake.conf.in + Used to generate qmake.conf with the correct toolchain. + +Signed-off-by: Michael Olbrich <[email protected]> +--- + mkspecs/qws/linux-ptx-g++/qmake.conf.in | 87 ++++++++++++++++++++++++++++++ + mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 + 2 files changed, 89 insertions(+) + +Index: b/mkspecs/qws/linux-ptx-g++/qmake.conf.in +=================================================================== +--- /dev/null ++++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in +@@ -0,0 +1,87 @@ ++# ++# qmake configuration for linux-g++ ++# ++ ++MAKEFILE_GENERATOR = UNIX ++TEMPLATE = app ++CONFIG += qt link_prl ++QT += core gui network ++QMAKE_INCREMENTAL_STYLE = sublib ++ ++QMAKE_CC = @compiler_pre...@gcc ++QMAKE_LEX = flex ++QMAKE_LEXFLAGS = ++QMAKE_YACC = yacc ++QMAKE_YACCFLAGS = -d ++QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS_WARN_ON = -Wall -W ++QMAKE_CFLAGS_WARN_OFF = ++QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CFLAGS_DEBUG = -g ++QMAKE_CFLAGS_SHLIB = -fPIC ++QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses ++QMAKE_CFLAGS_THREAD = -D_REENTRANT ++QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden ++ ++QMAKE_CXX = @compiler_pre...@g++ ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON ++QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF ++QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE ++QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG ++QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB ++QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC ++QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD ++QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden ++ ++QMAKE_INCDIR = @INCDIR@ ++QMAKE_LIBDIR = @LIBDIR@ ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] ++QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include/ ++QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib ++ ++QMAKE_LINK = @compiler_pre...@g++ ++QMAKE_LINK_SHLIB = @compiler_pre...@g++ ++QMAKE_LFLAGS = @LDFLAGS@ ++QMAKE_LFLAGS_RELEASE = ++QMAKE_LFLAGS_DEBUG = ++QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB ++QMAKE_LFLAGS_SONAME = -Wl,-soname, ++QMAKE_LFLAGS_THREAD = ++QMAKE_RPATH = -Wl,-rpath, ++ ++QMAKE_LIBS = ++QMAKE_LIBS_DYNLOAD = -ldl ++QMAKE_LIBS_X11 = ++QMAKE_LIBS_X11SM = ++QMAKE_LIBS_QT = -lqte ++QMAKE_LIBS_QT_THREAD = -lqte-mt ++QMAKE_LIBS_QT_OPENGL = -lqgl ++QMAKE_LIBS_QTOPIA = -lqtopia -lqpe ++QMAKE_LIBS_THREAD = -lpthread ++QMAKE_LIBS_OPENGL = ++ ++QMAKE_MOC = $$[QT_INSTALL_BINS]/moc ++QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++ ++QMAKE_AR = @compiler_pre...@ar cqs ++QMAKE_RANLIB = ++ ++QMAKE_TAR = tar -cf ++QMAKE_GZIP = gzip -9f ++ ++QMAKE_COPY = cp -f ++QMAKE_MOVE = mv -f ++QMAKE_DEL_FILE = rm -f ++QMAKE_DEL_DIR = rmdir ++QMAKE_STRIP = strip ++QMAKE_CHK_DIR_EXISTS = test -d ++QMAKE_MKDIR = mkdir -p ++include(../../common/unix.conf) ++load(qt_config) +Index: b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h +=================================================================== +--- /dev/null ++++ b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h +@@ -0,0 +1,2 @@ ++ ++#include "../../linux-g++/qplatformdefs.h" diff --git a/patches/qt-everywhere-opensource-src-4.6.2/series b/patches/qt-everywhere-opensource-src-4.6.2/series new file mode 100644 index 0000000..333ec23 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.2/series @@ -0,0 +1 @@ +ptx-mkspec.diff diff --git a/rules/avahi.in b/rules/avahi.in index 3b0a51e..c8dd8ea 100644 --- a/rules/avahi.in +++ b/rules/avahi.in @@ -117,6 +117,12 @@ config AVAHI_SERVICES help install avahi service descriptions +config AVAHI_SERVICES_PROJECTROOT + bool + depends on AVAHI_DAEMON + prompt "avahi services from projectroot" + help + install avahi services from ${ptxdist_workspace}/projectroot/etc/avahi/services endif config AVAHI_DNSCONFD diff --git a/rules/avahi.make b/rules/avahi.make index 51d9513..d94994d 100644 --- a/rules/avahi.make +++ b/rules/avahi.make @@ -189,6 +189,15 @@ ifdef AVAHI_SERVICES @$(call install_copy, avahi, 0, 0, 0644, -, /etc/avahi/services/ssh.service) endif +ifdef PTXCONF_AVAHI_SERVICES_PROJECTROOT + @cd $(PTXDIST_WORKSPACE)/projectroot/etc/avahi/services/; \ + for file in *; do \ + $(call install_copy, avahi, 0, 0, 0644, \ + $(PTXDIST_WORKSPACE)/projectroot/etc/avahi/services/$$file, \ + /etc/avahi/services/$$file, n); \ + done +endif + ifdef AVAHI_DNSCONFD # avahi dnsconfd (Unicast DNS server from mDNS/DNS-SD configuration daemon) # depends on avahi-daemon diff --git a/rules/host-qt4.make b/rules/host-qt4.make index 2b34ee9..03aed0a 100644 --- a/rules/host-qt4.make +++ b/rules/host-qt4.make @@ -1,4 +1,5 @@ # -*-makefile-*- +# $Id$ # # Copyright (C) 2009 by Michael Olbrich <[email protected]> # @@ -21,6 +22,25 @@ HOST_QT4_BUILDDIR = $(HOST_BUILDDIR)/$(QT4)-build HOST_QT4_BUILD_OOT := YES # ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +$(STATEDIR)/host-qt4.get: $(QT4_SOURCE) + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +$(STATEDIR)/host-qt4.extract: + @$(call targetinfo) + @$(call clean, $(HOST_QT4_DIR)) + @$(call extract, QT4, $(HOST_BUILDDIR)) + @$(call patchin, QT4, $(HOST_QT4_DIR)) + @$(call touch) + +# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -89,19 +109,7 @@ HOST_QT4_AUTOCONF := \ -no-gfx-qvfb \ -no-gfx-vnc \ -no-gfx-multiscreen \ - -no-kbd-tty \ - -no-kbd-usb \ - -no-kbd-sl5000 \ - -no-kbd-yopy \ - -no-kbd-vr41xx \ - -no-kbd-qvfb \ - -no-mouse-pc \ - -no-mouse-bus \ - -no-mouse-linuxtp \ - -no-mouse-yopy \ - -no-mouse-vr41xx \ - -no-mouse-tslib \ - -no-mouse-qvfb + -no-kbd-tty # ---------------------------------------------------------------------------- # Compile @@ -155,5 +163,13 @@ $(STATEDIR)/host-qt4.install: @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qmake @echo -e "[Paths]\nPrefix=$(SYSROOT)/usr\nBinaries=$(PTXCONF_SYSROOT_HOST)/bin" > $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf @$(call touch) +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-qt4_clean: + rm -rf $(STATEDIR)/host-qt4.* + rm -rf $(HOST_QT4_DIR) + rm -rf $(HOST_QT4_BUILDDIR) # vim: syntax=make diff --git a/rules/qt4.in b/rules/qt4.in index 21f37d8..08874e6 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -3,7 +3,6 @@ menuconfig QT4 tristate select HOST_QT4 - select TSLIB if QT4_MOUSE_TSLIB select DBUS if QT4_DBUS_LOAD || QT4_DBUS_LINK select GLIB if QT4_GLIB select ZLIB if QT4_ZLIB_SYSTEM @@ -283,73 +282,14 @@ config QT4_KBD_TTY help Generic console (tty) driver -config QT4_KBD_USB - bool - prompt "USB" - help - Generic usb keyboard driver - -config QT4_KBD_SL5000 - bool - prompt "SL5000 [BROKEN]" - # needs asm/sharp_char.h - depends on BROKEN - -config QT4_KBD_YOPY - bool - prompt "Yopy [BROKEN]" - # needs linux/yopy_button.h - depends on BROKEN - -config QT4_KBD_VR41XX - bool - prompt "Vr41XX" - -config QT4_KBD_QVFB - bool - prompt "Qt Virtual Frambuffer" - help - Keyboard driver for the Qt Virtual Frambuffer - endmenu menu "mouse drivers " -config QT4_MOUSE_PC - bool - prompt "Generic Mouse Driver" - help - Generic driver for the MouseMan, IntelliMouse, Microsoft and MouseSystems - protocols. - -config QT4_MOUSE_BUS - bool - prompt "Bus" - config QT4_MOUSE_LINUXTP bool prompt "Linux Touch Panel" -config QT4_MOUSE_YOPY - bool - prompt "Yopy" - -config QT4_MOUSE_VR41XX - bool - prompt "NEC Vr41XX" - -config QT4_MOUSE_TSLIB - bool - prompt "Tslib" - help - Driver for the universal touch screen library, tslib. - -config QT4_MOUSE_QVFB - bool - prompt "Qt Virtual Frambuffer" - help - Mouse driver for the Qt Virtual Frambuffer - endmenu # prepare the build system to build the examples diff --git a/rules/qt4.make b/rules/qt4.make index 784fb0e..a2ee541 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_QT4) += qt4 # # Paths and names # -QT4_VERSION := 4.5.3 -QT4 := qt-embedded-linux-opensource-src-$(QT4_VERSION) +QT4_VERSION := 4.6.2 +QT4 := qt-everywhere-opensource-src-$(QT4_VERSION) QT4_SUFFIX := tar.gz QT4_URL := http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX) QT4_SOURCE := $(SRCDIR)/$(QT4).$(QT4_SUFFIX) @@ -205,20 +205,6 @@ else QT4_AUTOCONF += -no-kbd-tty endif -# usb keyboard driver -ifdef PTXCONF_QT4_KBD_USB -QT4_AUTOCONF += -qt-kbd-usb -else -QT4_AUTOCONF += -no-kbd-usb -endif - -# sl5000 keyboard driver -ifdef PTXCONF_QT4_KBD_SL5000 -QT4_AUTOCONF += -qt-kbd-sl5000 -else -QT4_AUTOCONF += -no-kbd-sl5000 -endif - # yopy keyboard driver ifdef PTXCONF_QT4_KBD_YOPY QT4_AUTOCONF += -qt-kbd-yopy @@ -226,34 +212,6 @@ else QT4_AUTOCONF += -no-kbd-yopy endif -# vr41xx keyboard driver -ifdef PTXCONF_QT4_KBD_VR41XX -QT4_AUTOCONF += -qt-kbd-vr41xx -else -QT4_AUTOCONF += -no-kbd-vr41xx -endif - -# qvfb keyboard driver -ifdef PTXCONF_QT4_KBD_QVFB -QT4_AUTOCONF += -qt-kbd-qvfb -else -QT4_AUTOCONF += -no-kbd-qvfb -endif - -# pc mouse driver -ifdef PTXCONF_QT4_MOUSE_PC -QT4_AUTOCONF += -qt-mouse-pc -else -QT4_AUTOCONF += -no-mouse-pc -endif - -# bus mouse driver -ifdef PTXCONF_QT4_MOUSE_BUS -QT4_AUTOCONF += -qt-mouse-bus -else -QT4_AUTOCONF += -no-mouse-bus -endif - # linuxtp mouse driver ifdef PTXCONF_QT4_MOUSE_LINUXTP QT4_AUTOCONF += -qt-mouse-linuxtp @@ -261,13 +219,6 @@ else QT4_AUTOCONF += -no-mouse-linuxtp endif -# yopy mouse driver -ifdef PTXCONF_QT4_MOUSE_YOPY -QT4_AUTOCONF += -qt-mouse-yopy -else -QT4_AUTOCONF += -no-mouse-yopy -endif - # vr41xx mouse driver ifdef PTXCONF_QT4_MOUSE_VR41XX QT4_AUTOCONF += -qt-mouse-vr41xx @@ -275,20 +226,6 @@ else QT4_AUTOCONF += -no-mouse-vr41xx endif -# tslib mouse driver -ifdef PTXCONF_QT4_MOUSE_TSLIB -QT4_AUTOCONF += -qt-mouse-tslib -else -QT4_AUTOCONF += -no-mouse-tslib -endif - -# qvfb mouse driver -ifdef PTXCONF_QT4_MOUSE_QVFB -QT4_AUTOCONF += -qt-mouse-qvfb -else -QT4_AUTOCONF += -no-mouse-qvfb -endif - # PNG support ifdef PTXCONF_QT4_PNG_NONE QT4_AUTOCONF += -no-libpng @@ -882,4 +819,13 @@ endif @$(call touch) +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +qt4_clean: + rm -rf $(STATEDIR)/qt4.* + rm -rf $(IMAGEDIR)/qt4_* + rm -rf $(QT4_DIR) + # vim: syntax=make
-- ptxdist mailing list [email protected]
