Commit Graph

123 Commits

Author SHA1 Message Date
Peter Korsgaard
99fd373bf5 package: fixup dependencies after mysql_client -> mysql rename
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-22 07:24:35 +01:00
Julien Boibessot
195235c9d9 qt4: allow separate build/installation of demos and examples
Signed-off-by: Jeremie Scheer <jeremie.scheer@armadeus.com>
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-09 21:03:58 +01:00
Jerzy Grzegorek
aa593ddbc1 package: add <pkg>_VERSION_MAJOR variable
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 21:37:39 +01:00
Thomas De Schampheleire
3d86d29bf0 packages: remove package clean commands
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-08 19:42:34 +01:00
Thomas De Schampheleire
eb7bd9ef61 packages: remove uninstall commands
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-06 09:40:40 +01:00
Peter Korsgaard
fe8d728db5 qt: fix build with opengl es
Fixes http://autobuild.buildroot.net/results/efe/efe26c54361094fb1e201da6915900cd9b24d596/

qt doesn't use pkg-config to figure out the needed compiler/linker flags
for egl, so pass them explicitly instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-29 11:25:25 +01:00
Vicente Olivert Riera
1d57723541 qt: Disable QtScript on non-supported platforms
There is no support for certain platforms in QtScript right now, so
buildroot upstream suggested to disable the possibility of enabling
QtScript on those platforms as a quick fix for the 2013.11 release:

   http://lists.busybox.net/pipermail/buildroot/2013-November/083157.html

QtScript doesn't build because it uses JavaScriptCore, so we re-use the
existing BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT option which already lists
which platforms are supported by JavaScriptCore in Qt4.

In addition, a proposed fix to add support for MIPS64 has already been
sent to Qt:

   https://bugreports.qt-project.org/browse/QTBUG-35030

Fixes:

   http://autobuild.buildroot.net/results/fd7/fd7e7e53290f235b540ed5f3c784e2584fdb41e0/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-28 22:47:36 +01:00
Thomas De Schampheleire
be084204eb Config.in files: add missing dependencies to toolchain option comments
When a package A depends on config option B and toolchain option C, then
the comment that is given when C is not fulfilled should also depend on B.
For example:

config BR2_PACKAGE_A
	depends on BR2_B
	depends on BR2_LARGEFILE
	depends on BR2_WCHAR

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

This comment should actually be:

comment "A needs a toolchain w/ largefile, wchar"
	depends on BR2_B
	depends on !BR2_LARGEFILE || !BR2_WCHAR

or if possible (typically when B is a package config option declared in that
same Config.in file):

if BR2_B

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

[other config options depending on B]

endif

Otherwise, the comment would be visible even though the other dependencies
are not met.

This patch adds such missing dependencies, and changes existing such
dependencies from
  depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC
to
  depends on BR2_BASE_DEP
  depends on !BR2_TOOLCHAIN_USES_GLIBC
so that (positive) base dependencies are separate from the (negative)
toolchain dependencies. This strategy makes it easier to write such comments
(because one can simply copy the base dependency from the actual package
config option), but also avoids complex and long boolean expressions.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (untested)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-10 23:59:57 +01:00
Thomas Petazzoni
1f9c04f618 qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option
The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to force the
activation or disabling of the JIT compiler in the Qt Javascript
interpreter. However, the JIT compiler is not available for all
architectures, so forcing its activation does not always
work. Moreover, Qt knows by itself for which architectures JIT support
is possible, and will automatically enable it if possible.

Therefore, this option was in fact useless, and causing build problems
when enabled on architectures for which the JIT support was not
available. This commit removes this option and there is no
replacement: Qt will enable JIT at compile time when possible.

Fixes:

  http://autobuild.buildroot.org/results/aae/aaeb82753b7654eeca679ded5d0211ceebda3ea2/build-end.log
  http://autobuild.buildroot.org/results/367/3670e4f03ff0ce114c90bd7139243d82c427b52a/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-10 12:11:01 +01:00
Thomas Petazzoni
01f99d284f qt: don't allow building WebKit on some architectures
WebKit has some architecture specific support, and therefore is not
necessarily available for all architectures. Make sure the Qt WebKit
option cannot be selected on those architectures that are not
supported.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-04 23:59:17 +01:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Peter Korsgaard
dfcb93aa5c qt: needs threads
Fixes http://autobuild.buildroot.net/results/489/489f3ddcd023e6d1eaf8efa1da99d726f60da921/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-24 13:25:30 +02:00
Vivien Didelot
93917b6980 qt: install translations
The Qt translation files are currently created and moved under
$(STAGING_DIR)/usr/translations but not installed on the target.

This patch defines the translations directory to
/usr/share/qt/translations and defines a QT_INSTALL_TARGET_TRANSLATIONS
macro to deploy them from the staging directory to the target directory.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-19 21:41:33 +02:00
Spenser Gilliland
3c71b90ce3 qt: add powervr and opengl
Use the following to test:
/usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sundareson, Prabindh <prabu@ti.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Sinan Akpolat <sinan@linkas.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-16 00:28:43 +02:00
Jonathan Liu
8508dbb6d2 qt: add patch for QTBUG-31579 to fix polyline drawing
Upstream bug: https://bugreports.qt-project.org/browse/QTBUG-31579

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-07 21:18:24 +02:00
Peter Korsgaard
8a0d1fd193 qt: bump version
For details, see http://blog.qt.digia.com/blog/2013/07/02/qt-4-8-5-released/

Also move to the (current?) official download location, as the previous
location doesn't have 4.8.5.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-03 16:58:41 +02:00
Gustavo Zacarias
416a405d60 qt: broken on avr32
Qt is broken for the avr32 architecture since it lacks TLS support.
Fixes:
http://autobuild.buildroot.net/results/56d/56d1d8f12a847f1ba49547a51d7a3605755a0bb8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-27 19:39:45 +02:00
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