Commit Graph

73 Commits

Author SHA1 Message Date
Peter Korsgaard
7e4d475938 qt: fix webkit/sqlite build without largefile support
The embedded sqlite module forces FILE_OFFSET_BITS=64 unless
SQLITE_DISABLE_LFS is defined, breaking the build for !largefile toolchains.
Webkit internally builds sqlite, so that's affected as well.

Fix it by passing -DSQLITE_DISABLE_LFS in C/CXXFLAGS for !largefile
builds, similar to how we do it for the standalone sqlite package.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-27 11:56:11 +02:00
Peter Korsgaard
36f8b40d22 qt: fix typo in webkit pthread_getattr_np patch
Missing continuation (\) character in #if check.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-27 10:29:46 +02:00
Peter Korsgaard
417df559ad qt: update pthread_getattr_np patches for uClibc 0.9.32
And only when linuxthreads.old is used, as the other thread implementations
don't need it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-22 21:58:46 +02:00
Peter Korsgaard
0a78829e0a qt: QtDeclarative needs script support as well
Otherwise configure errors out with:

Error: QtDeclarative was requested, but it can't be built due to
QtScript or QtGui being disabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-21 13:15:04 +02:00
Daniel Mack
377b2785c1 Qt: add config option to build libQtDeclarative module
Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-20 11:50:43 +02:00
Thomas Petazzoni
5c8c02a0c6 qt: scripttools needs gui
The QtScriptTools library depends on the QtGui library, as can be seen
in the src/src.pro file of the Qt sources :

!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools

If the scripttools are enabled in the Qt configuration, but not the
gui, then the scripttools library is not built by Qt, and the
Buildroot build process fails with:

cp: cannot stat `/home/test/outputs/test-502/host/usr/sh4-unknown-linux-gnu/sysroot/usr/lib/libQtScriptTools.so.*': No such file or directory

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-22 15:52:34 +02:00
Peter Korsgaard
f5a106e22a qt: fix build when script+dbus are enabled, but gui isn't
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 14:27:24 +02:00
Peter Korsgaard
b1f3114253 qt: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 14:09:42 +02:00
Peter Korsgaard
5db57b7ac9 qt: hide shared library option if BR2_PREFER_STATIC_LIB
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-12 17:07:15 +02:00
Peter Korsgaard
125e2558b2 Get rid of unneeded CFLAGS
Now that we use a wrapper for external toolchains (and internal ones
default to the correct setting), we no longer need to explicitly pass
sysroot/march/mtune/mabi/floating point mode in TARGET_CFLAGS.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-05 23:39:03 +02:00
Thomas Petazzoni
a219ed3f7b qt: speed up qmake build
qmake is built during the execution of Qt ./configure script, so it is
built just with a normal make, not taking advantage of parallel
compilation. Passing MAKEFLAGS=-j$(BR2_JLEVEL) allows to speed up the
qmake compilation process quite a bit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-04-03 20:12:28 +02:00
Thomas Petazzoni
9fd85d8168 qt: fix plugin installation and change plugin path
Since the conversion of Qt to GENTARGETS in
421cda1fd0, plugin installation could
break in some situations, for example if SQL support was enabled, but
without any SQL driver: the sql plugin directory doesn't exist, but
our qt.mk wanted to copy it.

This patches simplifies the plugin handling a bit, and basically
copies all Qt plugins installed in the $(STAGING_DIR) to the
$(TARGET_DIR), assuming Qt has only built and installed the needed
plugins.

Moreover, instead of installing plugins to usr/plugins, which is a odd
location, we install them in usr/lib/qt/plugins. This requires a small
patch to Qt ./configure script so that even when -hostprefix is used,
the -plugindir option is taken into account.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-04-03 20:11:25 +02:00
Peter Korsgaard
187ca32ae4 qt: fix qt3 support target install
"lib" shouldn't be prefixed, otherwise the make file tries to install
liblibQt3Support.so.*.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-29 13:34:25 +02:00
Thomas Petazzoni
421cda1fd0 qt: convert to the GENTARGETS infrastructure
In addition to converting the qt package to the GENTARGETS
infrastructure, this commit also does the following (related) things
in the Qt package:

 * Create a BR2_PACKAGE_QT_CONFIG_FILE option, which can be used to
   pass a custom Qt configuration file, such as the ones found in
   src/corelib/global/qconfig-*.h. This used to be possible, but
   required changing qt.mk directly, which isn't really how we
   configure things in Buildroot.

 * Remove the BR2_PACKAGE_QT_EMB_PLATFORM option, the embedded
   platform name is now computed directly in qt.mk.

 * The QT_CONFIGURE variable, which hosted all ./configure options,
   has been renamed to QT_CONFIGURE_OPTS, for consistency with what we
   do in the AUTOTARGETS infrastructure.

 * The QT_DEP_LIBS variable has been renamed to QT_DEPENDENCIES, so
   that dependencies are properly handled by the GENTARGETS
   infrastructures.

 * The QT_QMAKE_SET macro (used to adjust the path/flags of the
   compiler/linker) has been extended with an additional argument,
   which allows to pass the source directory of Qt.

 * All the installation procedure has been rewritten to fit within the
   GENTARGETS mechanism.

[Peter: fixed minor issues pointed out by Will]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Will Wagner <willw@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-28 00:02:46 +02:00
Peter Korsgaard
808f98e3eb qt: dbus module doesn't depend on gui support
Seems I somehow got this wrong back in December (bff5248202).

At the same time fix a typo in the comment.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-25 22:13:54 +01:00
Gustavo Zacarias
7bdbdd3c38 qt: add option for system sqlite
Add an option to use the system sqlite library.
Also drop sqlite2 stub since it's pointless.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-05 15:32:01 +01:00
Peter Korsgaard
6b46297675 qt: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-01 17:08:42 +01:00
Peter Korsgaard
42daeb7241 qt: qt3 compatibility needs gui support
Closes #2911

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-28 21:46:05 +01:00
Daniel Nyström
fab79678f0 qt: add option to hide mouse cursor
Allow the user to build Qt with the QT_NO_QWS_CURSOR macro set.

Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-25 21:45:31 +01:00
Gustavo Zacarias
e5f6f55e12 qt: make QT_QMAKE variable point to HOST_DIR now
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-09 23:01:44 +01:00
Thomas Petazzoni
ca290e7e28 qt: move host programs and specs in HOST_DIR
The Qt build system installs all host programs (uic, rcc, moc, qmake,
etc.) in the same base directory as the headers and libraries, but
that's not great for Buildroot.

So we now move the host programs and the mkspecs files to the
$(HOST_DIR), and create a qt.conf, which tells qmake where everything
is located.

Tested with Qmake and Cmake as build system for a simple Qt
application.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-07 18:22:25 +01:00
Peter Korsgaard
bff5248202 qt: dbus module needs gui support as well
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-28 00:07:53 +01:00
Thomas Petazzoni
4c31d75ca4 qt: fix mysql module build
Closes #2371

Bug 2371 was a Qt compilation issue when MySQL support was enabled,
because the Qt configuration tests were looking at host MySQL
libraries.

Even though I couldn't reproduce the bug with MySQL libraries
installed on my host, there was clearly a problem since
-I/usr/include/mysql and -L/usr/lib/mysql were part of the compilation
flags when building those tests.

This was caused by the fact that /usr/bin/mysql_config was used
instead of $(STAGING_DIR)/usr/bin/mysql_config. We fix this by passing
the path to the correct mysql_config script using the -mysql_config Qt
./configure argument. Since this mysql_config script returns the
correct flags for libraries and headers path, the hardcoded -I and -L
flag in qt.mk are no longer needed.

With this in place, Qt is no longer compiled with -I/usr/include/mysql
and -L/usr/lib/mysql, which presumably should fix the problem reported
in bug 2371.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-22 22:08:42 +01:00
Peter Korsgaard
11ab05f53a qt: svg and multimedia modules depends on gui module as well
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-20 11:17:05 +01:00
Peter Korsgaard
e98318205c qt: phonon support depends on gui module
Otherwise configure errors out with 'Phonon enabled, but GUI disabled'.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-20 10:12:39 +01:00
Frederik Pasch
d3d67f7fb5 qt: only build gui module if enabled
Closes #2905

Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-08 23:09:24 +01:00
Peter Korsgaard
13a51114c6 qt: tighten webkit dependencies
webkit needs shared library and gui support to build, so make that visible
in Config.in.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-27 21:09:59 +01:00
Will Newton
32b748086e package/qt: Remove selects of BR2_PACKAGE_QT_JAVASCRIPTCORE.
Building WebKit or Script engine support would select JIT support
in JavaScriptCore. Not all platforms support JIT, so remove the
selects to allow the option to be modified by users.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-27 20:48:24 +01:00
Luca Ceresoli
f53c46ffb2 qt: bump to 4.7.1
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-22 23:27:18 +01:00
Peter Korsgaard
e25fe7239f qt: also patch webkit instance of javascriptcore
Closes #2821, #2827

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-17 22:00:29 +01:00
Peter Korsgaard
61881e8d30 qt: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-08 09:48:31 +01:00
Paul Jones
f47b29353f qt: Bump to 4.6.3
Also add option to build example and demo code

[Peter: fix patch handling]
Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-09-09 10:30:19 +02:00
Peter Korsgaard
0b415edef3 qt: fix sysroot confusion in ./configure
qt's configure script is getting confused now that we're passing --sysroot=
in QMAKE_CC / QMAKE_CXX, causing misdetection of features and runtime
breakage.

Fix it by passing --sysroot in CFLAGS/CXXFLAGS instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-08-26 17:47:43 +02:00
Luca Ceresoli
cf75bd2789 qt: fix alsa-lib dependency
If BR2_PACKAGE_QT_AUDIO_BACKEND=y, QtMultimedia requires the audio backend
to be already in staging in order to compile.
The backend is system-dependent, but since buildroot builds Linux systems
only, it is safe to assume that the it will always be ALSA.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-26 22:52:50 +02:00
Peter Korsgaard
470e9deec1 qt: fix mysql dependency and disable unavailable sql drivers
We don't have the needed dependencies in BR for most of the SQL drivers,
so mark those options as broken.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-16 23:55:30 +02:00
Peter Korsgaard
b922151c25 qt: fix directfb dependency
Closes #2221

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-16 23:55:12 +02:00
Sagaert Johan
a67a62c296 qt: fix javscriptcore/multimedia build with uClibc
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-12 16:53:18 +02:00
Karl Krach
57120f08a6 qt: install qt3 support lib to target if enabled
Signed-off-by: Karl Krach <mailinglists@blueSpirit.la>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-09 14:55:02 +02:00
Luca Ceresoli
79ec8e88f3 qt: fix libQtMultimedia installation
With BR2_PACKAGE_QT_MULTIMEDIA=y, libQtMultimedia.so.* was not
copied to the target directory.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-05 22:18:46 +02:00
Peter Korsgaard
a7ebf231b4 qt: powerpc config is now called powerpc, not ppc
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-26 09:38:41 +02:00
Peter Korsgaard
4059a814bb qt: use depends on for gstreamer
Gstreamer has complicated dependencies (because of glib2), so use
depends on rather than select. At the same time default phonon support
to Y if gstreamer is available, as this support is likely wanted.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-25 22:54:42 +02:00
Peter Korsgaard
bb81787ae1 qt: update x86x86fix for 32bit pc hosts
The recent change to use config.guess to figure out GNU_HOST_NAME
broken the x86x86fix detection for 32bit hosts, as config.guess
returns something like i686-pc-linux-gnu rather than something with
*-unknown-linux-* like we used to use.

Fix it by simply looking for "linux" instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-21 08:53:34 +02:00
Thomas Petazzoni
60281cbfe4 Guess build system and remove BR2_GNU_BUILD_SUFFIX
Instead of having a configuration option BR2_GNU_BUILD_SUFFIX, let's
use config.guess to guess the build system type.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:33 +02:00
Frederik Vannoote
d5a3fa6867 qt: bump version
qt 4.6.x has a number of new configure options, and needs a patch to
work on uClibc.

Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:34:22 +02:00
Peter Korsgaard
f220498f4b get rid of broken nios2 support
Has been marked as broken for more than 1 year, with no indication
that anyone cares, and it needs a bunch of special handling.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-03-30 17:19:59 +02:00
Francisco Gonzalez Morell
f4f157041e qt: fix the patch name for qt-4.5.3 version
Signed-off-by: Francisco Gonzalez Morell <gzmorell@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-02-24 00:40:20 +01:00
Ormund Williams
bc41dc5b8f qt: Re-enable workaround for building on x86 for x86 target, also check for x86_64
[Peter: combined x86 + x86-64 logic, simplified]
Signed-off-by: Ormund Williams <ormundw@panix.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-18 09:46:19 +01:00
Peter Korsgaard
8086dfa32f qt: ensure libglib2 is built before qt if enabled for Qt's glib support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-12 11:56:16 +01:00
Peter Korsgaard
f31bbf9e68 qt: add selection for keyboard drivers
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
Peter Korsgaard
81cb4205d0 package/qt: bump version
I know 4.6.0 is out, but I don't have a setup to test it at the moment,
so lets stick with 4.5.x for now.

There's apparently no .tar.bz2 of 4.5.3.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14 17:29:59 +01:00