Skip to contentSkip to conversation

qtopia4

PATCH New Thomas Lundquist 4 participants 12 messages Dec 11, 2006 – Dec 13, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qtopia4

Here is the qtopia4 package. opensourceversion tested on i386 and commercial on arm. svn diff againt todays trunk.

Thomas.
-------------- next part --------------

Config.in +1 -0
Index: package/Config.in
===================================================================
@@ -121,6 +121,7 @@
 source "package/psmisc/Config.in"
 source "package/python/Config.in"
 source "package/qte/Config.in"
+source "package/qtopia4/Config.in"
 source "package/raidtools/Config.in"
 source "package/readline/Config.in"
 source "package/rsync/Config.in"
qtopia4/qconfig-myfile.h +244 -0

244 lines not on this page · raw message

qtopia4/qtopia4.mk +274 -0

274 lines not on this page · raw message

qtopia4/Config.in +60 -0

60 lines not on this page · raw message

#1 lore raw

PATCH 1/1 qtopia4

Quoted 25 lines · Thomas Lundquist

Here is the qtopia4 package. opensourceversion tested on i386 and commercial on arm. svn diff againt todays trunk.

Thomas.

Index: package/Config.in
===================================================================

Config.in +0 -0
@@ -121,6 +121,7 @@

source "package/psmisc/Config.in"
source "package/python/Config.in"
source "package/qte/Config.in"
+source "package/qtopia4/Config.in"
source "package/raidtools/Config.in"
source "package/readline/Config.in"
source "package/rsync/Config.in"
Index: package/qtopia4/qconfig-myfile.h
===================================================================

qtopia4/qconfig-myfile.h +1 -0
@@ -0,0 +1,244 @@
+/****************************************************************************

qtopia4/qconfig-myfile.h line 11

Quoted 10 lines
qtopia4/qconfig-myfile.h +10 -0
+**
+** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** Licensees holding a valid Qt License Agreement may use this file in
+** accordance with the rights, responsibilities and obligations
+** contained therein.  Please consult your licensing agreement or
+** contact sales at trolltech.com if any conditions of this licensing
+** agreement are not clear to you.

hm? buildroot is LGPL, AFAIK. I don't remember so have signed nor received any license-agreement with trolltech.. Furthermore, i'm convinced that i don't want to sign any license-agreement with trolltech ;)

So what's the deal with this header? Do you have written permission to redistribute it under an LGPL compatible license?

thanks,

Quoted 582 lines
qtopia4/qconfig-myfile.h +233 -0
+**
+** Further information about Qt licensing is available at:
+** http://www.trolltech.com/products/qt/licensing.html or by
+** contacting info at trolltech.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+// Data structures
+#ifndef QT_NO_QUUID_STRING
+#  define QT_NO_QUUID_STRING
+#endif
+#ifndef QT_NO_STL
+#  define QT_NO_STL
+#endif
+
+// Dialogs
+#ifndef QT_NO_COLORDIALOG
+#  define QT_NO_COLORDIALOG
+#endif
+#ifndef QT_NO_ERRORMESSAGE
+#  define QT_NO_ERRORMESSAGE
+#endif
+#ifndef QT_NO_FONTDIALOG
+#  define QT_NO_FONTDIALOG
+#endif
+#ifndef QT_NO_INPUTDIALOG
+#  define QT_NO_INPUTDIALOG
+#endif
+#ifndef QT_NO_FILEDIALOG
+#  define QT_NO_FILEDIALOG
+#endif
+#ifndef QT_NO_PRINTDIALOG
+#  define QT_NO_PRINTDIALOG
+#endif
+#ifndef QT_NO_PROGRESSDIALOG
+#  define QT_NO_PROGRESSDIALOG
+#endif
+#ifndef QT_NO_TABDIALOG
+#  define QT_NO_TABDIALOG
+#endif
+
+// File I/O
+#ifndef QT_NO_DOM
+#  define QT_NO_DOM
+#endif
+#ifndef QT_NO_TEXTSTREAM
+#  define QT_NO_TEXTSTREAM
+#endif
+#ifndef QT_NO_LIBRARY
+#  define QT_NO_LIBRARY
+#endif
+
+// Fonts
+#ifndef QT_NO_FREETYPE
+#  define QT_NO_FREETYPE
+#endif
+
+// Images
+#ifndef QT_NO_IMAGEFORMATPLUGIN
+#  define QT_NO_IMAGEFORMATPLUGIN
+#endif
+#ifndef QT_NO_IMAGEFORMAT_BMP
+#  define QT_NO_IMAGEFORMAT_BMP
+#endif
+#ifndef QT_NO_IMAGEFORMAT_JPEG
+#  define QT_NO_IMAGEFORMAT_JPEG
+#endif
+#ifndef QT_NO_IMAGEFORMAT_PPM
+#  define QT_NO_IMAGEFORMAT_PPM
+#endif
+#ifndef QT_NO_IMAGEFORMAT_XPM
+#  define QT_NO_IMAGEFORMAT_XPM
+#endif
+#ifndef QT_NO_IMAGEFORMAT_XBM
+#  define QT_NO_IMAGEFORMAT_XBM
+#endif
+#ifndef QT_NO_IMAGE_TEXT
+#  define QT_NO_IMAGE_TEXT
+#endif
+
+// Internationalization
+#ifndef QT_NO_QWS_INPUTMETHODS
+#  define QT_NO_QWS_INPUTMETHODS
+#endif
+#ifndef QT_NO_TEXTCODEC
+#  define QT_NO_TEXTCODEC
+#endif
+#ifndef QT_NO_BIG_CODECS
+#  define QT_NO_BIG_CODECS
+#endif
+#ifndef QT_NO_CODECS
+#  define QT_NO_CODECS
+#endif
+#ifndef QT_NO_TEXTCODECPLUGIN
+#  define QT_NO_TEXTCODECPLUGIN
+#endif
+#ifndef QT_NO_TRANSLATION_UTF8
+#  define QT_NO_TRANSLATION_UTF8
+#endif
+
+// ItemViews
+#ifndef QT_NO_SORTFILTERPROXYMODEL
+#  define QT_NO_SORTFILTERPROXYMODEL
+#endif
+#ifndef QT_NO_DIRMODEL
+#  define QT_NO_DIRMODEL
+#endif
+#ifndef QT_NO_PROXYMODEL
+#  define QT_NO_PROXYMODEL
+#endif
+#ifndef QT_NO_STRINGLISTMODEL
+#  define QT_NO_STRINGLISTMODEL
+#endif
+#ifndef QT_NO_TABLEVIEW
+#  define QT_NO_TABLEVIEW
+#endif
+#ifndef QT_NO_TREEVIEW
+#  define QT_NO_TREEVIEW
+#endif
+
+// Kernel
+#ifndef QT_NO_CLIPBOARD
+#  define QT_NO_CLIPBOARD
+#endif
+#ifndef QT_NO_DRAGANDDROP
+#  define QT_NO_DRAGANDDROP
+#endif
+#ifndef QT_NO_PROPERTIES
+#  define QT_NO_PROPERTIES
+#endif
+#ifndef QT_NO_SESSIONMANAGER
+#  define QT_NO_SESSIONMANAGER
+#endif
+#ifndef QT_NO_SHORTCUT
+#  define QT_NO_SHORTCUT
+#endif
+#ifndef QT_NO_WHEELEVENT
+#  define QT_NO_WHEELEVENT
+#endif
+#ifndef QT_NO_CURSOR
+#  define QT_NO_CURSOR
+#endif
+
+// Networking
+#ifndef QT_NO_URLINFO
+#  define QT_NO_URLINFO
+#endif
+#ifndef QT_NO_COP
+#  define QT_NO_COP
+#endif
+#ifndef QT_NO_HTTP
+#  define QT_NO_HTTP
+#endif
+#ifndef QT_NO_FTP
+#  define QT_NO_FTP
+#endif
+#ifndef QT_NO_NETWORKPROXY
+#  define QT_NO_NETWORKPROXY
+#endif
+#ifndef QT_NO_SOCKS5
+#  define QT_NO_SOCKS5
+#endif
+
+// Painting
+#ifndef QT_NO_COLORNAMES
+#  define QT_NO_COLORNAMES
+#endif
+#ifndef QT_NO_PICTURE
+#  define QT_NO_PICTURE
+#endif
+#ifndef QT_NO_PRINTER
+#  define QT_NO_PRINTER
+#endif
+
+// Qtopia Core
+#ifndef QT_NO_QWS_SOUNDSERVER
+#  define QT_NO_QWS_SOUNDSERVER
+#endif
+#ifndef QT_NO_QWS_PROPERTIES
+#  define QT_NO_QWS_PROPERTIES
+#endif
+#ifndef QT_NO_QWS_KEYBOARD
+#  define QT_NO_QWS_KEYBOARD
+#endif
+#ifndef QT_NO_QWS_SXE
+#  define QT_NO_QWS_SXE
+#endif
+
+// Styles
+#ifndef QT_NO_STYLE_WINDOWS
+#  define QT_NO_STYLE_WINDOWS
+#endif
+#ifndef QT_NO_STYLE_CDE
+#  define QT_NO_STYLE_CDE
+#endif
+#ifndef QT_NO_STYLE_WINDOWSXP
+#  define QT_NO_STYLE_WINDOWSXP
+#endif
+
+// Widgets
+#ifndef QT_NO_SYNTAXHIGHLIGHTER
+#  define QT_NO_SYNTAXHIGHLIGHTER
+#endif
+#ifndef QT_NO_TEXTEDIT
+#  define QT_NO_TEXTEDIT
+#endif
+#ifndef QT_NO_TEXTBROWSER
+#  define QT_NO_TEXTBROWSER
+#endif
+#ifndef QT_NO_MENUBAR
+#  define QT_NO_MENUBAR
+#endif
+#ifndef QT_NO_WORKSPACE
+#  define QT_NO_WORKSPACE
+#endif
+#ifndef QT_NO_SIZEGRIP
+#  define QT_NO_SIZEGRIP
+#endif
+#ifndef QT_NO_WHATSTHIS
+#  define QT_NO_WHATSTHIS
+#endif
+#ifndef QT_NO_SIGNALMAPPER
+#  define QT_NO_SIGNALMAPPER
+#endif
+#ifndef QT_NO_TOOLTIP
+#  define QT_NO_TOOLTIP
+#endif
+#ifndef QT_NO_VALIDATOR
+#  define QT_NO_VALIDATOR
+#endif

Index: package/qtopia4/qtopia4.mk
===================================================================

qtopia4/qtopia4.mk +274 -0
@@ -0,0 +1,274 @@
+######################################################################
+#
+# qtopia4 (Qtopia Core 4)
+# http://www.trolltech.com/
+# 
+# This makefile composed by Thomas Lundquist <[email protected]>
+#
+# There is two versions built, one for the target and one for
+# staging. The target version is built in the staging_dir and the
+# staging version in the toolchain_dir.
+#
+# BTW, this uses alot of FPU calls and it's pretty slow if you use 
+# the kernels FPU emulation so it's better to choose soft float in the 
+# buildroot config (and uClibc.config of course, if you have your own.)
+#
+######################################################################
+
+QTOPIA4_VER:=4.2.2
+QTOPIA4_CAT:=zcat
+
+BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
+#"
+
+# What to download, free or commercial version.
+ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
+
+BR2_QTOPIA4_COMMERCIAL_PASSWORD:=$(shell echo $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)| sed -e 's/"//g')
+QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
+QTOPIA4_SOURCE:=qtopia-core-commercial-src-$(QTOPIA4_VER).tar.gz
+QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VER)
+QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VER)
+
+else
+
+# Good, good, we are free:
+
+QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source/
+QTOPIA4_SOURCE:=qtopia-core-opensource-src-$(QTOPIA4_VER).tar.gz
+QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VER)
+QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VER)
+
+endif
+
+# If you want it:
+# (Can also be set in the target device makefiles.)
+# For the options you can set in this file, look at 
+# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qfeatures.txt
+QTOPIA4_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.h
+# QTOPIA4_QCONFIG_COMMAND:=-qconfig myfile
+QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
+
+ifeq ($(BR2_LARGEFILE),y)
+QTOPIA4_LARGEFILE=-no-largefile
+else
+QTOPIA4_LARGEFILE=-no-largefile
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
+QTOPIA4_QT3SUPPORT=-qt3support
+else
+QTOPIA4_QT3SUPPORT=-no-qt3support
+endif
+ifeq ($(BR2_PACKAGE_TSLIB),y)
+QTOPIA4_TSLIB=-qt-mouse-tslib
+QTOPIA4_TSLIB_DEP=tslib
+QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
+QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
+#"
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
+QTOPIA4_DEBUG="-debug-and-release $(QTOPIA4_TSLIB_DEB)"
+else
+QTOPIA4_DEBUG=-release
+endif
+ifeq ($(BR2_ENDIAN),"LITTLE")
+QTOPIA4_ENDIAN=-little-endian
+else
+QTOPIA4_ENDIAN=-big-endian
+endif
+
+QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
+#"
+BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
+#"
+
+
+# This is for staging.
+QTOPIA4_STAGING_DIR:=$(STAGING_DIR)/usr/Trolltech
+QTOPIA4_QMAKE=$(QTOPIA4_STAGING_DIR)/bin/qmake
+
+$(DL_DIR)/$(QTOPIA4_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
+
+qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE)
+
+#################################
+#
+# Target
+#
+#################################
+
+$(QTOPIA4_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
+	$(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(QTOPIA4_TARGET_DIR)/.unpacked
+
+# This configure is very tailored towards my needs.
+$(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
+	# Patching configure to get rid of some feature I dont want.
+	# (I don't want SQL either but there is no option for that at all. 
+	# the SQL library will be built even without the plugins/drivers.
+	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/;' $(QTOPIA4_TARGET_DIR)/configure
+	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/;' $(QTOPIA4_TARGET_DIR)/configure
+	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/;' $(QTOPIA4_TARGET_DIR)/configure
+	$(SED) 's/-O2/-Os/;' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	cp $(QTOPIA4_QCONFIG_FILE) \
+	 	$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
+		PATH=$(TARGET_PATH) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \
+		QPEHOME=/usr \
+		QPEDIR=/usr \
+		./configure \
+		-v \
+		-platform linux-g++ \
+		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
+		-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
+		$(QTOPIA4_QCONFIG_COMMAND) \
+		$(QTOPIA4_DEBUG) \
+		-depths 8 \
+		-no-cups \
+		-no-nis \
+		-no-freetype \
+		-no-libmng \
+		-no-sql-db2 \
+		-no-sql-ibase \
+		-no-sql-mysql \
+		-no-sql-oci \
+		-no-sql-odbc \
+		-no-sql-psql \
+		-no-sql-sqlite \
+		-no-sql-sqlite2 \
+		-no-sql-tds \
+		-prefix /usr \
+		-prefix-install \
+		-L $(STAGING_DIR)/usr/lib \
+		-I $(STAGING_DIR)/usr/include \
+		$(QTOPIA4_QT3SUPPORT) \
+		$(QTOPIA4_TSLIB) \
+		$(QTOPIA4_LARGEFILE) \
+		$(QTOPIA4_ENDIAN) \
+	);
+	touch $(QTOPIA4_TARGET_DIR)/.configured
+
+$(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/.configured
+	# $(TARGET_CONFIGURE_OPTS) $(MAKE) PATH=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$$PATH CROSS_COMPILE=$(KERNEL_CROSS) CC=$(TARGET_CC) -C $(QTOPIA4_TARGET_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		-C $(QTOPIA4_TARGET_DIR) sub-src
+	touch $(QTOPIA4_TARGET_DIR)/.compiled
+		# -C $(QTOPIA4_TARGET_DIR) sub-src
+
+$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		INSTALL_ROOT=$(STAGING_DIR) \
+		-C $(QTOPIA4_TARGET_DIR) \
+		sub-src-install_subtargets-ordered \
+		install_qmake install_mkspecs
+	# We don't need no stinking Sql libraries:
+	-rm $(TARGET_DIR)/usr/lib/*Sql*
+	# Nor Svg
+	-rm $(TARGET_DIR)/usr/lib/*Svg*
+
+$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER)
+	mkdir -p $(TARGET_DIR)/usr/lib/fonts
+	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
+	# touch $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER)
+	cp -a $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -a $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -a $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -a $(STAGING_DIR)/usr/lib/*.so.* $(TARGET_DIR)/usr/lib/
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VER)
+
+#################################
+#
+# Host/Staging
+#
+#################################
+
+$(QTOPIA4_HOST_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
+	$(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(QTOPIA4_HOST_DIR)/.unpacked
+
+# This configure is very tailored towards my needs.
+$(QTOPIA4_HOST_DIR)/.configured: $(QTOPIA4_HOST_DIR)/.unpacked
+	# Patching configure to get rid of some feature I dont want.
+	# (I don't want SQL either but there is no option for that at all. 
+	# the SQL library will be built even without the plugins/drivers.
+	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/;' $(QTOPIA4_HOST_DIR)/configure
+	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/;' $(QTOPIA4_HOST_DIR)/configure
+	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/;' $(QTOPIA4_HOST_DIR)/configure
+	$(SED) 's/-O2/-Os/;' $(QTOPIA4_HOST_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	cp $(QTOPIA4_QCONFIG_FILE) \
+	 	$(QTOPIA4_HOST_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+	(cd $(QTOPIA4_HOST_DIR); rm -rf config.cache; \
+		PATH=$(TARGET_PATH) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \
+		QPEHOME=/usr \
+		QPEDIR=/usr \
+		./configure \
+		-v \
+		-platform linux-g++ \
+		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
+		-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
+		$(QTOPIA4_QCONFIG_COMMAND) \
+		$(QTOPIA4_DEBUG) \
+		-depths 8 \
+		-no-cups \
+		-no-nis \
+		-no-freetype \
+		-no-libmng \
+		-no-sql-db2 \
+		-no-sql-ibase \
+		-no-sql-mysql \
+		-no-sql-oci \
+		-no-sql-odbc \
+		-no-sql-psql \
+		-no-sql-sqlite \
+		-no-sql-sqlite2 \
+		-no-sql-tds \
+		-prefix $(QTOPIA4_STAGING_DIR) \
+		-prefix-install \
+		-L $(STAGING_DIR)/usr/lib \
+		-I $(STAGING_DIR)/usr/include \
+		$(QTOPIA4_QT3SUPPORT) \
+		$(QTOPIA4_TSLIB) \
+		$(QTOPIA4_LARGEFILE) \
+		$(QTOPIA4_ENDIAN) \
+	);
+	touch $(QTOPIA4_HOST_DIR)/.configured
+
+$(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_HOST_DIR)/.configured
+	# $(TARGET_CONFIGURE_OPTS) $(MAKE) PATH=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$$PATH CROSS_COMPILE=$(KERNEL_CROSS) CC=$(TARGET_CC) -C $(QTOPIA4_HOST_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		-C $(QTOPIA4_HOST_DIR)
+	touch $(QTOPIA4_HOST_DIR)/.compiled
+		# -C $(QTOPIA4_HOST_DIR) sub-src
+
+$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VER)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		-C $(QTOPIA4_HOST_DIR) install \
+		# sub-src-install_subtargets-ordered \
+		# install_qmake install_mkspecs \
+		#
+
+qtopia4: uclibc zlib $(QTOPIA4_TSLIB_DEP) \
+		$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VER) \
+		$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER)
+
+qtopia4-clean:
+	-$(MAKE) -C $(QTOPIA4_HOST_DIR) clean
+	-$(MAKE) -C $(QTOPIA4_TARGET_DIR) clean
+
+qtopia4-dirclean:
+	rm -rf $(QTOPIA4_HOST_DIR)
+	rm -rf $(QTOPIA4_TARGET_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_QTOPIA4)),y)
+TARGETS+=qtopia4
+endif

Index: package/qtopia4/Config.in
===================================================================

qtopia4/Config.in +60 -0
@@ -0,0 +1,60 @@
+config BR2_PACKAGE_QTOPIA4
+	bool "qtopia4"
+	default n
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_PTHREADS_NATIVE
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBPNG
+	help
+	  Qtopia core 4.
+
+	  http://www.trolltech.com/
+
+config BR2_PACKAGE_QTOPIA4_DEBUG
+        bool "Compile with debug support"
+        default y 
+	depends BR2_PACKAGE_QTOPIA4
+        help
+
+config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
+        string "Qtopia Core 4 Commercial License Username"
+        default ""
+	depends BR2_PACKAGE_QTOPIA4
+        help
+            Commercial users can download their source directly by providing a username.
+
+
+config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
+        string "Qtopia Core 4 Commercial License Password"
+        default ""
+	depends BR2_PACKAGE_QTOPIA4
+        help
+            Commercial users can download their source directly by providing a password.
+
+config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
+        bool "Compatibility with Qt3"
+        default y 
+	depends BR2_PACKAGE_QTOPIA4
+        help
+	    Turns on support for older Qt3.
+
+config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
+        string "The embedded platform we are making Qtopia4 for"
+	default "arm"	if BR2_arm
+	default "arm"	if BR2_armeb
+	default "x86"	if BR2_i386
+	default "x86_64"	if BR2_x86_64
+	default "mips"	if BR2_mips
+	default "mips"	if BR2_mipsel
+# Not that I really believe these will work..
+	default "generic"	if BR2_alpha
+	default "generic"	if BR2_chris
+	default "generic"	if BR2_m68k
+	default "generic"	if BR2_nios2
+	default "generic"	if BR2_powerpc
+	default "generic"	if BR2_sh
+	default "generic"	if BR2_sh64
+	default "generic"	if BR2_sparc
+	depends BR2_PACKAGE_QTOPIA4
+        help
+	    The platform.

_______________________________________________
buildroot mailing list
buildroot at uclibc.org
http://busybox.net/mailman/listinfo/buildroot

#2 lore raw

PATCH 1/1 qtopia4

Quoted 42 lines · Bernhard Fischer
Quoted 32 lines · Thomas Lundquist

Here is the qtopia4 package. opensourceversion tested on i386 and commercial on arm. svn diff againt todays trunk.

Thomas.

Index: package/Config.in
===================================================================

Config.in (working copy) renamed from Config.in (revision 16845) +0 -0
@@ -121,6 +121,7 @@

source "package/psmisc/Config.in"
source "package/python/Config.in"
source "package/qte/Config.in"
+source "package/qtopia4/Config.in"
source "package/raidtools/Config.in"
source "package/readline/Config.in"
source "package/rsync/Config.in"
Index: package/qtopia4/qconfig-myfile.h
===================================================================

qtopia4/qconfig-myfile.h (revision 0) +7 -0
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** Licensees holding a valid Qt License Agreement may use this file

in +** accordance with the rights, responsibilities and obligations

qtopia4/qconfig-myfile.h (revision 0)

Quoted 3 lines
qtopia4/qconfig-myfile.h (revision 0) +3 -0
+** contained therein.  Please consult your licensing agreement or
+** contact sales at trolltech.com if any conditions of this licensing
+** agreement are not clear to you.

hm? buildroot is LGPL, AFAIK. I don't remember so have signed nor received any license-agreement with trolltech.. Furthermore, i'm convinced that i don't want to sign any license-agreement with trolltech ;)

Quoted 3 lines

So what's the deal with this header? Do you have written permission to redistribute it under an LGPL compatible license?

If it is a file from Trolltech, then the "qtopia4.mk" could download the file.

Best Regards,
Ulf Samuelsson

#3 lore raw

PATCH 1/1 qtopia4

In reply to Bernhard Fischer
Quoted 10 lines · Bernhard Fischer

Review line 3

Quoted 5 lines

+++ package/qtopia4/qconfig-myfile.h (revision 0)

(quoted diff) +3 -0
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.

hm? buildroot is LGPL, AFAIK. I don't remember so have signed nor received any license-agreement with trolltech.. Furthermore, i'm convinced that i don't want to sign any license-agreement with trolltech ;)

Hmm, ok :=)

(As you of course have guessed already; I didn't even think about that file having any weird license. it's meant to be tweaked by the licensee/user.)

Quoted 2 lines

So what's the deal with this header? Do you have written permission to redistribute it under an LGPL compatible license?

Well, it's the same header in the opensource version, so what they mean by it is something I just won't be bothered to check

So, new patch applied, this time without the file and a little more describing comment around the use of the file.

Thomas.
-------------- next part --------------

Config.in +1 -0
Index: package/Config.in
===================================================================
@@ -121,6 +121,7 @@
 source "package/psmisc/Config.in"
 source "package/python/Config.in"
 source "package/qte/Config.in"
+source "package/qtopia4/Config.in"
 source "package/raidtools/Config.in"
 source "package/readline/Config.in"
 source "package/rsync/Config.in"
qtopia4/qtopia4.mk +278 -0

278 lines not on this page · raw message

qtopia4/Config.in +60 -0

60 lines not on this page · raw message

#4 lore raw

PATCH 1/1 qtopia4

Quoted 12 lines · Thomas Lundquist
Quoted 10 lines · Bernhard Fischer

Review line 3

Quoted 5 lines

+++ package/qtopia4/qconfig-myfile.h (revision 0)

(quoted diff) +3 -0
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.

hm? buildroot is LGPL, AFAIK. I don't remember so have signed nor received any license-agreement with trolltech.. Furthermore, i'm convinced that i don't want to sign any license-agreement with trolltech ;)

Quoted 1 line

Hmm, ok :=)

See comments below.

Quoted 43 lines

(As you of course have guessed already; I didn't even think about that file having any weird license. it's meant to be tweaked by the licensee/user.)

Quoted 2 lines

So what's the deal with this header? Do you have written permission to redistribute it under an LGPL compatible license?

Well, it's the same header in the opensource version, so what they mean by it is something I just won't be bothered to check

So, new patch applied, this time without the file and a little more describing comment around the use of the file.

Thomas.

Index: package/Config.in
===================================================================

Config.in +0 -0
@@ -121,6 +121,7 @@

source "package/psmisc/Config.in"
source "package/python/Config.in"
source "package/qte/Config.in"
+source "package/qtopia4/Config.in"
source "package/raidtools/Config.in"
source "package/readline/Config.in"
source "package/rsync/Config.in"
Index: package/qtopia4/qtopia4.mk
===================================================================

qtopia4/qtopia4.mk +9 -0
@@ -0,0 +1,278 @@
+######################################################################
+#
+# qtopia4 (Qtopia Core 4)
+# http://www.trolltech.com/
+# 
+# This makefile composed by Thomas Lundquist <[email protected]>
+#
+# There is two versions built, one for the target and one for
+# staging. The target version is built in the staging_dir and the

qtopia4/qtopia4.mk line 19

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+# staging version in the toolchain_dir.
+#
+# BTW, this uses alot of FPU calls and it's pretty slow if you use 
+# the kernels FPU emulation so it's better to choose soft float in the 
+# buildroot config (and uClibc.config of course, if you have your own.)
+#
+######################################################################
+
+QTOPIA4_VER:=4.2.2
+QTOPIA4_CAT:=zcat

No. Some people who only have "gzip -d -c" but no zcat will stumble across this. Please use $(ZCAT) -- or $(BZCAT) for bz2.

qtopia4/qtopia4.mk line 22

Quoted 3 lines
qtopia4/qtopia4.mk +3 -0
+
+BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
+#"

cosmetics, but looks like there are some closing parentheses missing to make vi happy..

qtopia4/qtopia4.mk line 27

Quoted 5 lines
qtopia4/qtopia4.mk +5 -0
+
+# What to download, free or commercial version.
+ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
+
+BR2_QTOPIA4_COMMERCIAL_PASSWORD:=$(shell echo $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)| sed -e 's/"//g')

Why spawn a subshell? Can't you just $(subst ",,$()) like for the username?

Quoted 23 lines
qtopia4/qtopia4.mk +23 -0
+QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
+QTOPIA4_SOURCE:=qtopia-core-commercial-src-$(QTOPIA4_VER).tar.gz
+QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VER)
+QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VER)
+
+else
+
+# Good, good, we are free:
+
+QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source/
+QTOPIA4_SOURCE:=qtopia-core-opensource-src-$(QTOPIA4_VER).tar.gz
+QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VER)
+QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VER)
+
+endif
+
+# If you want extra tweaking you can copy 
+# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
+# to the qtopia4 packages directory (where this .mk file is) and 
+# remove the comment.
+# QTOPIA4_QCONFIG_COMMAND:=-qconfig myfile
+#
+# For the options you can set in this file, look at 

qtopia4/qtopia4.mk line 60

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qfeatures.txt
+#
+QTOPIA4_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.h
+QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
+
+ifeq ($(BR2_LARGEFILE),y)
+QTOPIA4_LARGEFILE=-no-largefile
+else
+QTOPIA4_LARGEFILE=-no-largefile
+endif

No way to toggle largefile-support on, even if asked to?

qtopia4/qtopia4.mk line 71

Quoted 11 lines
qtopia4/qtopia4.mk +11 -0
+ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
+QTOPIA4_QT3SUPPORT=-qt3support
+else
+QTOPIA4_QT3SUPPORT=-no-qt3support
+endif
+ifeq ($(BR2_PACKAGE_TSLIB),y)
+QTOPIA4_TSLIB=-qt-mouse-tslib
+QTOPIA4_TSLIB_DEP=tslib
+QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
+QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
+#"

again,
#"))
or the like..

Quoted 4 lines
qtopia4/qtopia4.mk +4 -0
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
+QTOPIA4_DEBUG="-debug-and-release $(QTOPIA4_TSLIB_DEB)"
+else

qtopia4/qtopia4.mk line 85

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+QTOPIA4_DEBUG=-release
+endif
+ifeq ($(BR2_ENDIAN),"LITTLE")
+QTOPIA4_ENDIAN=-little-endian
+else
+QTOPIA4_ENDIAN=-big-endian
+endif
+
+QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
+#"

ditto.

qtopia4/qtopia4.mk line 87

Quoted 2 lines
qtopia4/qtopia4.mk +2 -0
+BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
+#"

ditto.

Quoted 20 lines
qtopia4/qtopia4.mk +20 -0
+
+
+# This is for staging.
+QTOPIA4_STAGING_DIR:=$(STAGING_DIR)/usr/Trolltech
+QTOPIA4_QMAKE=$(QTOPIA4_STAGING_DIR)/bin/qmake
+
+$(DL_DIR)/$(QTOPIA4_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
+
+qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE)
+
+#################################
+#
+# Target
+#
+#################################
+
+$(QTOPIA4_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
+	$(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(QTOPIA4_TARGET_DIR)/.unpacked

qtopia4/qtopia4.mk line 117

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+
+# This configure is very tailored towards my needs.
+$(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
+	# Patching configure to get rid of some feature I dont want.
+	# (I don't want SQL either but there is no option for that at all. 
+	# the SQL library will be built even without the plugins/drivers.
+	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/;' $(QTOPIA4_TARGET_DIR)/configure
+	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/;' $(QTOPIA4_TARGET_DIR)/configure
+	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/;' $(QTOPIA4_TARGET_DIR)/configure
+	$(SED) 's/-O2/-Os/;' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf

shouldn't this rather be
s/-O2/-Os $(TARGET_CFLAGS)/

Also, all trailing command separators (i.e. ';') in sed are superfluous.

qtopia4/qtopia4.mk line 123

Quoted 6 lines
qtopia4/qtopia4.mk +6 -0
+	cp $(QTOPIA4_QCONFIG_FILE) \
+	 	$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
+		PATH=$(TARGET_PATH) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \

Sounds like this is will break for anybody that doesn't have a plain "gcc" nor "g++" binary. Honor the user's HOSTCC and HOSTCXX vars, please.

Quoted 29 lines
qtopia4/qtopia4.mk +29 -0
+		QPEHOME=/usr \
+		QPEDIR=/usr \
+		./configure \
+		-v \
+		-platform linux-g++ \
+		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
+		-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
+		$(QTOPIA4_QCONFIG_COMMAND) \
+		$(QTOPIA4_DEBUG) \
+		-depths 8 \
+		-no-cups \
+		-no-nis \
+		-no-freetype \
+		-no-libmng \
+		-no-sql-db2 \
+		-no-sql-ibase \
+		-no-sql-mysql \
+		-no-sql-oci \
+		-no-sql-odbc \
+		-no-sql-psql \
+		-no-sql-sqlite \
+		-no-sql-sqlite2 \
+		-no-sql-tds \
+		-prefix /usr \
+		-prefix-install \
+		-L $(STAGING_DIR)/usr/lib \
+		-I $(STAGING_DIR)/usr/include \
+		$(QTOPIA4_QT3SUPPORT) \
+		$(QTOPIA4_TSLIB) \

qtopia4/qtopia4.mk line 162

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+		$(QTOPIA4_LARGEFILE) \
+		$(QTOPIA4_ENDIAN) \
+	);
+	touch $(QTOPIA4_TARGET_DIR)/.configured
+
+$(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/.configured
+	# $(TARGET_CONFIGURE_OPTS) $(MAKE) PATH=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$$PATH CROSS_COMPILE=$(KERNEL_CROSS) CC=$(TARGET_CC) -C $(QTOPIA4_TARGET_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		-C $(QTOPIA4_TARGET_DIR) sub-src
+	touch $(QTOPIA4_TARGET_DIR)/.compiled

Doesn't sound correct, or does QT create the .compiled file and you just update it's timestamp here?

qtopia4/qtopia4.mk line 163

Quoted 1 line
qtopia4/qtopia4.mk +1 -0
+		# -C $(QTOPIA4_TARGET_DIR) sub-src

Please remove the above.

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+
+$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		INSTALL_ROOT=$(STAGING_DIR) \
+		-C $(QTOPIA4_TARGET_DIR) \
+		sub-src-install_subtargets-ordered \
+		install_qmake install_mkspecs
+	# We don't need no stinking Sql libraries:
+	-rm $(TARGET_DIR)/usr/lib/*Sql*
+	# Nor Svg

qtopia4/qtopia4.mk line 183

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+	-rm $(TARGET_DIR)/usr/lib/*Svg*
+
+$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER)
+	mkdir -p $(TARGET_DIR)/usr/lib/fonts
+	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
+	# touch $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER)
+	cp -a $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -a $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -a $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -a $(STAGING_DIR)/usr/lib/*.so.* $(TARGET_DIR)/usr/lib/

*.so.*, not *.so* ?

Quoted 11 lines
qtopia4/qtopia4.mk +11 -0
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VER)
+
+#################################
+#
+# Host/Staging
+#
+#################################
+
+$(QTOPIA4_HOST_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
+	$(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(QTOPIA4_HOST_DIR)/.unpacked

qtopia4/qtopia4.mk line 204

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+
+# This configure is very tailored towards my needs.
+$(QTOPIA4_HOST_DIR)/.configured: $(QTOPIA4_HOST_DIR)/.unpacked
+	# Patching configure to get rid of some feature I dont want.
+	# (I don't want SQL either but there is no option for that at all. 
+	# the SQL library will be built even without the plugins/drivers.
+	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/;' $(QTOPIA4_HOST_DIR)/configure
+	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/;' $(QTOPIA4_HOST_DIR)/configure
+	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/;' $(QTOPIA4_HOST_DIR)/configure
+	$(SED) 's/-O2/-Os/;' $(QTOPIA4_HOST_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf

s/;//g

qtopia4/qtopia4.mk line 212

Quoted 8 lines
qtopia4/qtopia4.mk +8 -0
+	cp $(QTOPIA4_QCONFIG_FILE) \
+	 	$(QTOPIA4_HOST_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+	(cd $(QTOPIA4_HOST_DIR); rm -rf config.cache; \
+		PATH=$(TARGET_PATH) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \
+		QPEHOME=/usr \
+		QPEDIR=/usr \

See HOSTCC and HOSTCXX above.

Quoted 43 lines
qtopia4/qtopia4.mk +43 -0
+		./configure \
+		-v \
+		-platform linux-g++ \
+		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
+		-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
+		$(QTOPIA4_QCONFIG_COMMAND) \
+		$(QTOPIA4_DEBUG) \
+		-depths 8 \
+		-no-cups \
+		-no-nis \
+		-no-freetype \
+		-no-libmng \
+		-no-sql-db2 \
+		-no-sql-ibase \
+		-no-sql-mysql \
+		-no-sql-oci \
+		-no-sql-odbc \
+		-no-sql-psql \
+		-no-sql-sqlite \
+		-no-sql-sqlite2 \
+		-no-sql-tds \
+		-prefix $(QTOPIA4_STAGING_DIR) \
+		-prefix-install \
+		-L $(STAGING_DIR)/usr/lib \
+		-I $(STAGING_DIR)/usr/include \
+		$(QTOPIA4_QT3SUPPORT) \
+		$(QTOPIA4_TSLIB) \
+		$(QTOPIA4_LARGEFILE) \
+		$(QTOPIA4_ENDIAN) \
+	);
+	touch $(QTOPIA4_HOST_DIR)/.configured
+
+$(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_HOST_DIR)/.configured
+	# $(TARGET_CONFIGURE_OPTS) $(MAKE) PATH=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$$PATH CROSS_COMPILE=$(KERNEL_CROSS) CC=$(TARGET_CC) -C $(QTOPIA4_HOST_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		-C $(QTOPIA4_HOST_DIR)
+	touch $(QTOPIA4_HOST_DIR)/.compiled
+		# -C $(QTOPIA4_HOST_DIR) sub-src
+
+$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VER)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		-C $(QTOPIA4_HOST_DIR) install \
+		# sub-src-install_subtargets-ordered \

qtopia4/qtopia4.mk line 265

Quoted 10 lines
qtopia4/qtopia4.mk +10 -0
+		# install_qmake install_mkspecs \
+		#
+
+qtopia4: uclibc zlib $(QTOPIA4_TSLIB_DEP) \
+		$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VER) \
+		$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER)
+
+qtopia4-clean:
+	-$(MAKE) -C $(QTOPIA4_HOST_DIR) clean
+	-$(MAKE) -C $(QTOPIA4_TARGET_DIR) clean

can you please uninstall the files from the rootfs here?

Quoted 13 lines
qtopia4/qtopia4.mk +13 -0
+
+qtopia4-dirclean:
+	rm -rf $(QTOPIA4_HOST_DIR)
+	rm -rf $(QTOPIA4_TARGET_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_QTOPIA4)),y)
+TARGETS+=qtopia4
+endif

[snip]

#5 lore raw

PATCH 1/1 qtopia4

Quoted 3 lines · Bernhard Fischer

No. Some people who only have "gzip -d -c" but no zcat will stumble across this. Please use $(ZCAT) -- or $(BZCAT) for bz2.

fixed. just forgot that it's like that now.

Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
+#"

cosmetics, but looks like there are some closing parentheses missing to make vi happy..

I count three of each (open and close).

But checking the package/Makefile.in I notice that they have been added there aswell.

So, ok.

Quoted 2 lines

Why spawn a subshell? Can't you just $(subst ",,$()) like for the username?

but of course.

Quoted 8 lines

qtopia4/qtopia4.mk line 60

Quoted 6 lines
qtopia4/qtopia4.mk +6 -0
+
+ifeq ($(BR2_LARGEFILE),y)
+QTOPIA4_LARGEFILE=-no-largefile
+else
+QTOPIA4_LARGEFILE=-no-largefile
+endif

No way to toggle largefile-support on, even if asked to?

*blush*

Quoted 4 lines

qtopia4/qtopia4.mk line 117

Quoted 1 line
qtopia4/qtopia4.mk +1 -0
+	$(SED) 's/-O2/-Os/;' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf

shouldn't this rather be
s/-O2/-Os $(TARGET_CFLAGS)/

then it could be
s/-O2/$(TARGET_CFLAGS)/

since -Os should be included.

Something tells me that I shouldn't do that here. Don't ask me why, I spent quite alot of time getting qtopia to compile at all.

Quoted 1 line

Also, all trailing command separators (i.e. ';') in sed are superfluous.

It's a habit. Any real reason we should make it a requirement not to have it or is it just for looks?

Quoted 10 lines

qtopia4/qtopia4.mk line 123

Quoted 6 lines
qtopia4/qtopia4.mk +6 -0
+	cp $(QTOPIA4_QCONFIG_FILE) \
+	 	$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
+		PATH=$(TARGET_PATH) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \

Sounds like this is will break for anybody that doesn't have a plain "gcc" nor "g++" binary. Honor the user's HOSTCC and HOSTCXX vars, please.

If Troll/qtopia would, I would.
(No, they don't seem to honour CC nor CXX)

Quoted 8 lines

qtopia4/qtopia4.mk line 162

Quoted 5 lines

+$(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/.configured

qtopia4/qtopia4.mk +4 -0
+	# $(TARGET_CONFIGURE_OPTS) $(MAKE) PATH=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$$PATH CROSS_COMPILE=$(KERNEL_CROSS) CC=$(TARGET_CC) -C $(QTOPIA4_TARGET_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		-C $(QTOPIA4_TARGET_DIR) sub-src
+	touch $(QTOPIA4_TARGET_DIR)/.compiled

Doesn't sound correct, or does QT create the .compiled file and you just update it's timestamp here?

Ehh, old gruff. Not needed any more.

Quoted 3 lines

qtopia4/qtopia4.mk line 163

Quoted 1 line
qtopia4/qtopia4.mk +1 -0
+		# -C $(QTOPIA4_TARGET_DIR) sub-src

Please remove the above.

removed the superfluous comments.

Quoted 1 line

*.so.*, not *.so* ?

both works.

I'll send you a new patch with or without ;.
(and if you really don't want them I guess I have to remove them from other packages I've planned to submit.)

Thomas.

#6 lore raw

PATCH 1/1 qtopia4

Quoted 11 lines · Thomas Lundquist
Quoted 4 lines · Bernhard Fischer

qtopia4/qtopia4.mk line 117

Quoted 1 line
qtopia4/qtopia4.mk +1 -0
+	$(SED) 's/-O2/-Os/;' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf

shouldn't this rather be
s/-O2/-Os $(TARGET_CFLAGS)/

then it could be
s/-O2/$(TARGET_CFLAGS)/

since -Os should be included.

Yes.

Quoted 3 lines

Something tells me that I shouldn't do that here. Don't ask me why, I spent quite alot of time getting qtopia to compile at all.

Trouble is that some arches may need some fancy flags to generate proper code, users may want to globally set some additional flags that should be used for all packages that are built. Please verify if passing the correct TARGET_CFLAGS down to qtopia works as expected thus area lso used in qtopia.

Quoted 5 lines
Quoted 2 lines

Also, all trailing command separators (i.e. ';') in sed are superfluous.

It's a habit. Any real reason we should make it a requirement not to have it or is it just for looks?

Well, it's bloat :) Habit of mine to omit them if they are not needed.

Quoted 11 lines
Quoted 11 lines

qtopia4/qtopia4.mk line 123

Quoted 7 lines
qtopia4/qtopia4.mk +6 -0
+	cp $(QTOPIA4_QCONFIG_FILE) \
+	 	$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
+		PATH=$(TARGET_PATH) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \

Sounds like this is will break for anybody that doesn't have a plain "gcc" nor "g++" binary. Honor the user's HOSTCC and HOSTCXX vars, please.

Of course ment CC and CXX and not the host compilers, sorry.

Quoted 3 lines

If Troll/qtopia would, I would.
(No, they don't seem to honour CC nor CXX)

Can't be.. Otherwise you'd build qtopia for the host and not for the target. Please double check (could be that configure stores them for you).

Quoted 3 lines

I'll send you a new patch with or without ;.
(and if you really don't want them I guess I have to remove them from other packages I've planned to submit.)

Please do. It just wastes space and memory.
Thanks,

#7 lore raw

PATCH 1/1 qtopia4

Quoted 6 lines · Bernhard Fischer

Trouble is that some arches may need some fancy flags to generate proper code, users may want to globally set some additional flags that should be used for all packages that are built. Please verify if passing the correct TARGET_CFLAGS down to qtopia works as expected thus area lso used in qtopia.

you can't be too sure about that anyway. they have their own, pretty different (and not really well documented) build system.

I'd rather try to fix it if anyone actually comes up with a bug about it.

but changing to TARGET_CFLAGS is the right thingt to do so I tested it and it seems to work.

Quoted 4 lines
Quoted 2 lines

It's a habit. Any real reason we should make it a requirement not to have it or is it just for looks?

Well, it's bloat :) Habit of mine to omit them if they are not needed.

hehe.

but space isn't much of an issue in the buildroot scripts.

Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

Sounds like this is will break for anybody that doesn't have a plain "gcc" nor "g++" binary. Honor the user's HOSTCC and HOSTCXX vars, please.

Of course ment CC and CXX and not the host compilers, sorry.

I guessed so but it don't honour that either for building the host tools.

Quoted 6 lines
Quoted 2 lines

If Troll/qtopia would, I would.
(No, they don't seem to honour CC nor CXX)

Can't be.. Otherwise you'd build qtopia for the host and not for the target. Please double check (could be that configure stores them for you).

no. the TARGET_CC is set in the qmake.conf file, not in the .mk at all. the CC/CXX would be for compiling qmake and the stuff for cross compiling on the host.

it's a weird beast but somehow I understand the rationale behind it.

new patch attached.

Thomas.
-------------- next part --------------

Config.in +1 -0
Index: package/Config.in
===================================================================
@@ -121,6 +121,7 @@
 source "package/psmisc/Config.in"
 source "package/python/Config.in"
 source "package/qte/Config.in"
+source "package/qtopia4/Config.in"
 source "package/raidtools/Config.in"
 source "package/readline/Config.in"
 source "package/rsync/Config.in"
qtopia4/qtopia4.mk +271 -0

271 lines not on this page · raw message

qtopia4/Config.in +60 -0

60 lines not on this page · raw message

#8 lore raw

PATCH 1/1 qtopia4

Quoted 11 lines · Thomas Lundquist

On Mon, Dec 11, 2006 at 11:27:08PM +0100, Bernhard Fischer wrote:
[...]

Quoted 4 lines
Quoted 2 lines

It's a habit. Any real reason we should make it a requirement not to have it or is it just for looks?

Well, it's bloat :) Habit of mine to omit them if they are not needed.

hehe.

but space isn't much of an issue in the buildroot scripts.

(I think we're still tlaking about ";")

I'm involved in a project where a ";" instead of a "&&" between two dependent build steps is evil, naughty, and generally bad. Seems the ";" hides an error code from propagating to the make parent process to catch a failure. Much easier to write though.

It gets better... we don't seem to like pipes for the same reason. :(

In this case, the project deals with clearmake build-avoidance, and once a derived object gets into the pool, whether bad or good, it's a pain to purge. One viewpoint...

(I guess this means I don't need to fix the qte build if Qtopia Core will build for us :)

Allan

#9 lore raw

PATCH 1/1 qtopia4

Quoted 7 lines · Allan Clark
Quoted 6 lines · Thomas Lundquist

On Mon, Dec 11, 2006 at 11:27:08PM +0100, Bernhard Fischer wrote:
[...]

Quoted 3 lines
Quoted 2 lines

It's a habit. Any real reason we should make it a requirement not to have it or is it just for looks?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Well, it's bloat :) Habit of mine to omit them if they are not needed.

hehe.

but space isn't much of an issue in the buildroot scripts.

(I think we're still tlaking about ";")

We do indeed.

Quoted 3 lines

I'm involved in a project where a ";" instead of a "&&" between two dependent build steps is evil, naughty, and generally bad. Seems the

Note that we're talking about the command-separator of sed.

I don't buy the argument that "space isn't much of an issue in the buildroot scripts", fwiw.

Just don't add bloat in the first place, especially when it's superfluous, doesn't serve any purpose whatsoever etc. Anywhere. Anytime. At any rate.

It's a no-go.
Grossly OT, though. :P

#10 lore raw

PATCH 1/1 qtopia4

In reply to Allan Clark
Quoted 3 lines · Allan Clark

(I guess this means I don't need to fix the qte build if Qtopia Core will build for us :)

well, youo can at least use the patch I've provided. not sure what we ended up with here.

(And the ";"'s are gone.)

Thomas.