Commit Graph

106 Commits

Author SHA1 Message Date
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Luca Ceresoli
e98a621323 qt: define license
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-02 23:53:07 +02:00
Thomas Petazzoni
331b14a2ae qt, php: selecting mysql requires depending on MMU
The mysql_client package is only available on architectures having a
MMU, so all packages that are selecting mysql_client should depend on
BR2_USE_MMU.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-29 22:56:13 +02:00
Peter Korsgaard
ca79d23935 Merge branch 'next' 2013-03-01 11:11:24 +01:00
Daniel Nyström
1942836999 qt: install QML imports on target
When selecting the Qt declarative module, all the QML imports was
built and installed to staging, but never installed to the target.

Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Acked-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-27 23:57:50 +01:00
Luca Ceresoli
4b6f552a07 qt: disable precompiled headers to workaround compilation failure
Precompiled header implementation is buggy in current Qt as described at
http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.

The only known workaround is currently to add -no-pch to configure.

Fixes build failure terminating with error
  compiling ../3rdparty/pixman/pixman-arm-neon-asm.S
  cc1: fatal error: .pch/release-shared-emb-arm/QtGui: No such file or directory
  compilation terminated.
such as:
http://autobuild.buildroot.net/results/648265012591280fa592a239f86ee39aec2d5fa6/build-end.log

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-18 22:27:05 +01:00
Thomas Petazzoni
0e4d25ff0f packages: remove all := signs
Finally get rid of all := used for variable definitions in packages,
as we suggest in our manual and during the review of new packages.

While I was at it, I also sometimes added a few missing new lines
between the header and the first variable definition.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-20 20:49:02 +01:00
Sagaert Johan
8586b63ed3 qt: bump version to latest 4.8.4
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-13 19:56:46 +01:00
Frank Hunleth
49f16f4b97 qt: fix qconfig configure parameter
The Qt configure option for specifying a custom qconfig.h
file changed from -config to -qconfig. This makes the
corresponding change in qt.mk.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-14 01:04:44 +01:00
Thomas Petazzoni
3845a93b30 dbus: uses fork(), requires MMU
In order to solve
http://autobuild.buildroot.org/results/34f6843137efda20626af72714c110280ec577d7/build-end.log,
this patch makes the D-Bus package as well as all the packages that
select the D-Bus package 'depends on BR2_USE_MMU'.

In addition, for the specific case of gvfs, the missing
BR2_TOOLCHAIN_HAS_THREADS dependency is added (threads are required by
D-Bus, so they are also required by gvfs which selects D-Bus).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 23:49:26 +01:00
Mischa Jonker
19b18527d7 QT: Fix build for architectures using generic atomics
The problem has to do with const-correctness. This has been resolved
for various architectures, but not for the generic case.

Signed-off-by: Mischa Jonker <mischa.jonker@synopsys.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-04 13:07:52 +01:00
Gustavo Zacarias
019a581f89 packages: switch to host-pkgconf
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-29 22:02:55 +01:00
Thomas Petazzoni
beb45605db alsa-lib: require thread support
Some parts of alsa-lib correctly use threads only when available, but
some other parts, especially certain PCM plugins, unconditionally
require threads. While it would certainly be possible to fix alsa-lib
to only use threads when available, it probably doesn't make much
sense, since on an embedded system that has audio, we are probably
powerful enough to enable thread support in the C library.

Fixes:

  http://autobuild.buildroot.org/results/e14469be7f6171f4c8c0c09c8e32943819f7938b/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-20 21:50:21 +02:00
Peter Korsgaard
4dadcf292c qt: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-13 19:23:38 +02:00
Thomas Petazzoni
e6ce0f5bfb dbus: requires thread support
As can be seen on the build result at
http://autobuild.buildroot.org/results/20f1078ef7dc5f187b04c63ef70e8b43acf9bb3a/build-end.log,
D-Bus requires thread support in the toolchain.

This commit adjusts the Kconfig dependencies of D-Bus and all its
reverse dependencies to depend on thread support in the toolchain.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-25 18:25:43 +02:00
Thomas Petazzoni
aa457d3b24 qt: tune .pc files after installation in staging directory
The Qt configuration and installation process is a bit strange, and it
leads the .pc files to contain absolute paths to the staging
directory, while it should only contains paths relative to the staging
directory, because pkg-config already adds the path of the sysroot
automatically to the headers and libraries locations.

This allows the 'pkg-config --cflags' results for Qt libraries to be
correct.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-25 18:25:43 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Nathan Lynch
de780f6471 qt: change use of BR2_JLEVEL to PARALLEL_JOBS
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-24 11:10:28 +02:00
Luca Ceresoli
81e0952d9e qt: bump to 4.8.2
Also switch to the new upstream URL.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-20 22:37:22 +02:00
Luca Ceresoli
f703569bea qt: remove redundant and incorrect URL from Makefile
The upstream URL for Buildroot packages is usually visible in the Config.in
file, not in comments in the Makefile.

Moreover, this URL does not point to the correct upstream project.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-20 22:37:20 +02:00
Thomas Petazzoni
755a51f327 qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecs
In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs,
but also libraries that wish to integrate with qmake, such as
qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs,
so the easiest solution is to have a symbolic link between the two
directories, instead of copying things around.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-11 22:50:26 +02:00
Maxime Ripard
a33f6dfd50 Fix qt samples dependency on QtGUI
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-19 15:47:09 +02:00
Peter Korsgaard
8eaf4e5281 qt: tweak help text
Upstream URL of Qt is qt-project.org nowadays, and there's a single Qt
release for everyone.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-14 21:28:31 +02:00
Peter Korsgaard
650195deb9 qt: fix build on uClibc without lfs support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-14 21:26:52 +02:00
Peter Korsgaard
738b0b0555 qt: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-04 20:53:26 +02:00
Peter Korsgaard
974a0da6e1 qt: fix build with gcc 4.6.x on arm
As noted by Ismael Luceno. For details, see:
http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-26 22:30:12 +01:00
Ismael Luceno
fbfda06cb9 qt: simplify arch handling
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-26 22:15:51 +01:00
Peter Korsgaard
24bc2ff8c1 qt: bump version
Webkit support runs pkg-config at build time, so we need to ensure our
version gets picked up.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-25 22:52:02 +01:00
Frederik Pasch
1e39b8a6ff qt: needs host-pkg-config
Closes #4760

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-09 21:20:12 +01:00
Arnout Vandecappelle (Essensium/Mind)
d018125508 qt: qt-dbus: replace dependency on dbus by select
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-31 12:23:42 +01:00
Peter Korsgaard
a028c31ed0 qt: ensure cross pkg-config is used
Closes #4297

Tweak qmake.conf to ensure our cross pkg-config is used, instead of
whatever is first in the path. In order to do this, tweak the
QT_QMAKE_SET to be able to handle variables which aren't prefixed with
QMAKE_.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-18 12:08:02 +01:00
Thomas Petazzoni
0849e8193e package: remove useless arguments from GENTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:09:58 +02:00
Peter Korsgaard
27b58e3972 qt: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-17 07:51:10 +02:00
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