Commit Graph

93 Commits

Author SHA1 Message Date
Peter Korsgaard
b108fdcb83 Merge branch 'next'
Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-28 14:30:23 +01:00
Vicente Olivert Riera
8c5156cce0 qt5connectivity: Don't build scanner example without QtQuick
Apply upstream patch to fix this problem:

make[3]: Entering directory
`/home/test/test/3/output/build/qt5connectivity-5.2.0/examples/bluetooth'
cd scanner/ && ( test -e Makefile ||
/home/test/test/3/output/host/usr/bin/qmake
/home/test/test/3/output/build/qt5connectivity-5.2.0/examples/bluetooth/scanner/scanner.pro
-o Makefile ) && /usr/bin/make -f Makefile Project ERROR: Unknown
module(s) in QT: quick

Fixes:
   http://autobuild.buildroot.net/results/163/1635e4d385293ea560107bdf624033e8ffefbe72/

Upstream patch URL:
   1454664752/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-25 20:58:06 +01:00
Thomas Petazzoni
a0f42cdd37 qt5: needs NPTL threads
Fixes:

  http://autobuild.buildroot.org/results/70b/70b77e7a5b292e3fcbcf8cab4651c48220f2bd17/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-22 23:46:02 +01:00
Thomas Petazzoni
8797a8cb58 icu: not available when BR2_BINFMT_FLAT is used
icu does not recognize 'uclinux' as a supported platform. While making
it recognize uclinux is easy, there is another problem down the road:
icu does very weird things to generate an ELF library containing
static data (libicudata.a), and the generated library being ELF, it is
not compatible with the FLAT binary format expected by uclinux
platforms such as Blackfin in FLAT format.

Therefore, we simply disallow the selection of icu on FLAT
platforms.

Note that adding a dependency on BR2_BINFMT_ELF doesn't work, because
BR2_BINFMT_FDPIC is considered to be separate (even if technically
FDPIC is a derivative of ELF). That's why the dependency we're adding
is "depends on !BR2_BINFMT_FLAT" and not "depends on BR2_BINFMT_ELF".

Fixes:

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

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-20 19:06:31 +01:00
Peter Korsgaard
24badfe110 qt5: Rename BUILDROOT_COMPILER_C{,XX}FLAGS to BR_COMPILER_C{,XX}FLAGS
No functional change, but internal variables should be name BR_foo, not
BUILDROOT_foo (I think ..).

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-04 15:12:00 +01:00
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
Fatih Aşıcı
467ea8c2ee qt5base: add an option to build and install examples
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-01-02 15:04:16 +01:00
Fatih Aşıcı
e962b2a2f3 qt5webkit: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-31 00:09:40 +01:00
Fatih Aşıcı
08fc7be2bb qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-31 00:09:35 +01:00
Fatih Aşıcı
09f204a937 qt5: use a common option for JavaScriptCore dependencies
This will be used by other qt packages that contain a copy of
JavaScriptCore.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-31 00:09:24 +01:00
Fatih Aşıcı
a1980c2d30 qt5: disable on avr32
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-27 19:53:04 +01:00
Fatih Aşıcı
1d7adcb042 qt5base: restore posix_fallocate() patch
It was removed in e4a839277f.

Fixes: http://autobuild.buildroot.net/results/a24/a249b0cd5b20a2c3eee34b585cd58d4a03a9338e/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-27 19:52:21 +01:00
Fatih Aşıcı
1aa31b6511 qt5webkit: add upstream patch to fix build on ARM softfp
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-27 09:41:40 +01:00
Fatih Aşıcı
9e07d07d9d qt5connectivity: new package
QtNfc is not installed since it is not supported on Linux.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 18:14:33 +01:00
Fatih Aşıcı
dacc0a44ac qt5: install headers into /usr/include/qt5
There are places in Qt's source where headers included with the name of
the module subdirectory (e.g. #include <QtCore/QHash>). Therefore, the
build system passes the top header directory to the compiler; but this
results in a error when building host tools since sysroot/usr/include
directory includes architecture specific system headers.

In order to prevent this, install all Qt headers into a subdirectory in
/usr/include.

Fixes: http://autobuild.buildroot.net/results/4f1/4f16c0b38bdd6e40efcc781c12fae81c0bfabb72/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 18:14:27 +01:00
Fatih Aşıcı
ecf4dff4ee qt5: remove qt5jsbackend package
Upstream did not release a new version of this package since it is
superseded by the builtin qml engine found in new qt5declarative.

Fixes: http://autobuild.buildroot.net/results/3861aa91e03154c7d20f4157f0c3a1fa14838af1/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 18:14:20 +01:00
Thomas De Schampheleire
9235bb17a6 qt5quick1: add missing comment for toolchain option dependencies
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 21:41:03 +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
Vicente Olivert Riera
16e3c09442 qt5base: Add support for MIPS64 BigEndian
This patch adds support for MIPS64 BigEndian platforms and has already
been merged upstream:

cea101bd10

Now we can remove the restriction on the Config.in to disable the
selection of this packages on MIPS64 BigEndian platforms.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 16:34:23 +01:00
Vicente Olivert Riera
e4a839277f qt5: version bump
-bump version to 5.2.0
-remove unneeded patches
-remove invalid configure options

[Peter: uclibc-no-lfs + qatomic patches still needed, new patch for uClibc]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 16:33:47 +01:00
Vicente Olivert Riera
60e9010ec8 qt5webkit: disable for MIPS64
qt5webkit is not currently supported on MIPS64 platforms, so disable the
possibility of selecting this package in that platform.

In the future the following changes would be needed to fix this problem:
A new Source/JavaScriptCore/assembler/MacroAssemblerMIPS64.h file needs
to be created in order to add support for MIPS64 and MacroAssembler.h
needs to be modified to include that file in case of CPU(MIPS64).
Also Source/WTF/wtf/Platform.h and Source/WTF/wtf/dtoa/utils.h need to
be modified to add MIPS64 support.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-18 12:08:34 +01:00
Peter Korsgaard
50ce7ffb76 Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-01 20:32:00 +01:00
Vicente Olivert Riera
931b73e5ea qt5: Disable on MIPS64 BigEndian n64 platforms
qt5base fails to compile on MIPS64 BigEndian n64 platforms because there
are multiple calls to some functions that are disabled. Since every Qt5
package depends on qt5base we can disable Qt5 entirely. This is a quick
fix for the next release. In the meantime, a proposed patch to fix this
problem has already been sent to Qt:

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

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Acked-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-29 19:42:50 +01:00
Fatih Aşıcı
cb08d7b05d qt5base: use ccache if enabled
For now, it doesn't use ccache when compiling host tools (e.g. qmake).
It seems the fix is not trivial.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-29 10:09:45 +01:00
Fatih Aşıcı
86db2a76e2 qt5base: use -device-option to set mkspec variables
Simplify our custom qmake.conf:
  - Include linux_device_{pre,post}.conf to inherit common device
    configuration.
  - Do not add $(STAGING_DIR)/usr/include to include path. It is
    redundant.

In additon to the simplification of code, this change is a preparation
to solve problems occurring when QMAKE_CXX is prepended with ccache path.

Upstream patch is needed by configure to parse device options correctly.
Another upstream patch is needed to remove ARM specific parts from
linux_device_post.conf.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-28 23:05:29 +01:00
Fatih Aşıcı
291d5f031d qt5base: add Fedora patch to fix powerpc build
Fixes http://autobuild.buildroot.net/results/e57/e57dea01c3c1a4e3269580972890192c37d41697/

Patch submitted upstream:
https://codereview.qt-project.org/#change,71763

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-20 13:45:15 +01:00
Samuel Martin
be930801a2 qt5base: fix posix_fallocate patch
Fixes:
	http://autobuild.buildroot.net/results/a07/a07c1825a5295a8343cd89f0901d9a74a764d804/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-13 00:47:00 +01:00
Fatih Aşıcı
3a740799a9 qt5base: add missing hunk in posix_fallocate patch
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-12 13:32:37 +01:00
Fatih Aşıcı
68a48f0285 qt5base: detect posix_fallocate() at configure time
Fixes http://autobuild.buildroot.net/results/555278227680e90737e6dbe0a6dcc035507150aa/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-12 09:48:57 +01:00
Mischa Jonker
9b6c5e9c98 icu: Doesn't work on ARC yet
icu depends on __sync_sub_and_fetch and other atomic primitives that
don't exist in the ARC toolchain yet.

[Peter: adjust beecrypt/php comment dependency, don't mention atomic builtins]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-11 22:27:25 +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
Samuel Martin
ee8c811fe1 qt5webkit: fix build with bison-3.0
- Add host-bison dependency
- Fetch patch from upstream fixing build with bison-3.0
  (already included in the next 5.2 release)

Fixes:
	http://autobuild.buildroot.net/results/283/2831c0d859b035f7d2786f51885833a711b46b80/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-10 23:49:07 +01:00
Samuel Martin
d90d48ecae qt5base: fix rpi/egl support (vc_dispmanx_element_change_attributes proto mismatch)
Patch from upstream already included in the next 5.2 release

Fixes:
	http://autobuild.buildroot.net/results/347/347577bf1dee0fec3302a45f278eb253118a5b6f/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-10 23:48:39 +01:00
Ezequiel García
5986cb4163 qt5base: add tslib plugin
Add support for Tslib plugin.

[Peter: propagate !static dependency / add comment]
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-28 10:09:23 +01:00
Peter Korsgaard
0764b1cf45 qt5base: fix QtGUI build without PNG support
Patch from upstream bug report:
https://bugreports.qt-project.org/browse/QTBUG-33496

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 17:58:40 +02:00
Fatih Aşıcı
b601a07165 qt5x11extras: new package
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 16:40:18 +02:00
Fatih Aşıcı
cdeb175908 qt5serialport: new package
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 16:37:37 +02:00
Fatih Aşıcı
501f769538 qt5sensors: new package
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 16:10:26 +02:00
Fatih Aşıcı
b12ec639eb qt5quickcontrols: new package
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 15:40:53 +02:00
Fatih Aşıcı
5d85af61b7 qt5: bump to 5.1.1
Following patches are removed since they are upstreamed:
  - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
  - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch

Remove "-nomake demos" from configure options since "demos" directory is
merged into examples.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 14:00:54 +02: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
Fatih Aşıcı
f8a7c46ea3 qt5: remove configure options from module packages
These packages do not have configure scripts.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-09 23:13:59 +02:00
Fatih Aşıcı
6f21eefbe9 qt5base: fix build when egl headers need a definition
The build with gpu-viv-bin-mx6q libraries was broken since it wasn't
using "-DEGL_API_FB=1" flag which is found in egl.pc.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-02 22:53:06 +02:00
Fatih Aşıcı
62802d24c0 qt5: give numbers to patch files
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-02 09:44:31 +02:00
Fatih Aşıcı
3577ca6af2 qt5base: set eglfs platform hook for imx6
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-19 00:18:28 +02:00
Fatih Aşıcı
7816cc9ae6 qt5webkit: install qml's only if declarative module is selected
Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-18 12:26:17 +02:00
Fatih Aşıcı
a252d6f4c7 qt5webkit: select libXrender if xcb is enabled
[Peter: also add libXext]
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-18 12:25:52 +02:00
Jérôme Pouiller
741cbccb74 Fix build reproducibility in Make 3.82
Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.

This patch sort results of wildcards to ensure reproducibility.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-06 23:27:42 +02:00
Peter Korsgaard
ca47afb41e qt5webkit: needs gui support in qt
Fixes http://autobuild.buildroot.net/results/439ce2c3c33a92966808071d4fc7231d50453c79/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 14:13:00 +02:00
Thomas Petazzoni
4ed05f0ff6 qt5: change upstream URL
The Qt5 upstream URL has changed, which leads to build failures in the
autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-18 19:49:43 +02:00