Commit 92a0a108 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

qt5base: adjust linux-buildroot-g++ qmake.conf 



In order for qmake to generate correct moc command lines, we need to
make sure INCLUDEPATH contains $(STAGING_DIR)/usr/include. To do so,
we add a new line in our custom qmake.conf.

Also, in order to clearly identify the Buildroot specific variables
from the qmake standard variables, we prefix all the custom Buildroot
variables by BUILDROOT_ in qmake.conf.

This solves compilation issues of qt5svg such as "Undefined
interface", due to the fact that moc isn't passed a -I path pointing
to the main header directory.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 186ef9f6

package/qt5/qt5base/qt5base-mkspecs-files.patch

+13 −11
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf 
===================================================================

--- /dev/null

+++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf

@@ -0,0 +1,41 @@

@@ -0,0 +1,43 @@

+MAKEFILE_GENERATOR      = UNIX

+CONFIG                  += incremental gdb_dwarf_index

+QMAKE_INCREMENTAL_STYLE = sublib
@@ -27,25 +27,27 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf 
+

+QT_QPA_DEFAULT_PLATFORM = eglfs

+

+CROSS_COMPILE =

+COMPILER_CFLAGS =

+COMPILER_CXXFLAGS =

+BUILDROOT_CROSS_COMPILE =

+BUILDROOT_COMPILER_CFLAGS =

+BUILDROOT_COMPILER_CXXFLAGS =

+BUILDROOT_INCLUDE_PATH =

+

+# modifications to g++.conf

+QMAKE_CC                = $${CROSS_COMPILE}gcc

+QMAKE_CXX               = $${CROSS_COMPILE}g++

+QMAKE_CC                = $${BUILDROOT_CROSS_COMPILE}gcc

+QMAKE_CXX               = $${BUILDROOT_CROSS_COMPILE}g++

+QMAKE_LINK              = $${QMAKE_CXX}

+QMAKE_LINK_SHLIB        = $${QMAKE_CXX}

+

+# modifications to linux.conf

+QMAKE_AR                = $${CROSS_COMPILE}ar cqs

+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy

+QMAKE_STRIP             = $${CROSS_COMPILE}strip

+QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs

+QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy

+QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip

+

+#modifications to gcc-base.conf

+QMAKE_CFLAGS           += $${COMPILER_CFLAGS}

+QMAKE_CXXFLAGS         += $${COMPILER_CXXFLAGS}

+QMAKE_CFLAGS           += $${BUILDROOT_COMPILER_CFLAGS}

+QMAKE_CXXFLAGS         += $${BUILDROOT_COMPILER_CXXFLAGS}

+QMAKE_CXXFLAGS_RELEASE += -O3

+INCLUDEPATH            += $${BUILDROOT_INCLUDE_PATH}

+

+QMAKE_LIBS             += -lrt -lpthread -ldl

+

package/qt5/qt5base/qt5base.mk

+4 −3
Original line number Diff line number Diff line
@@ -134,9 +134,10 @@ define QT5BASE_CONFIG_SET 
endef



define QT5BASE_CONFIGURE_CMDS

	$(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS))

	$(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS))

	$(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))

	$(call QT5BASE_CONFIG_SET,BUILDROOT_CROSS_COMPILE,$(TARGET_CROSS))

	$(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CFLAGS,$(TARGET_CFLAGS))

	$(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))

	$(call QT5BASE_CONFIG_SET,BUILDROOT_INCLUDE_PATH,$(STAGING_DIR)/usr/include)

	$(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \

		$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES))

	(cd $(@D); \