mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 06:36:34 +00:00
qt5base: support OVERRIDE_SRCDIR
With OVERRIDE_SRCDIR we don't apply any of the qt5base patches, but the custom specs files are needed to be able to build - So install these in the configure step instead of having them as a patch. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
parent
a36d751abd
commit
e76d59c258
@ -1,41 +0,0 @@
|
|||||||
Add a Buildroot 'device' to ease cross-compilation
|
|
||||||
|
|
||||||
Qt5 has a mechanism to support "device" profiles, so that people can
|
|
||||||
specify the compiler, compiler flags and so on for a specific device.
|
|
||||||
|
|
||||||
We leverage this mechanism in the Buildroot packaging of qt5 to
|
|
||||||
simplify cross-compilation: we have our own "device" definition, which
|
|
||||||
allows us to easily pass the cross-compiler paths and flags from our
|
|
||||||
qt5.mk.
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
||||||
[Arnout: remove ccache support]
|
|
||||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
|
||||||
|
|
||||||
Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+include(../common/linux_device_pre.conf)
|
|
||||||
+
|
|
||||||
+# modifications to g++-unix.conf
|
|
||||||
+QMAKE_CC = $${CROSS_COMPILE}gcc
|
|
||||||
+QMAKE_CXX = $${CROSS_COMPILE}g++
|
|
||||||
+
|
|
||||||
+#modifications to gcc-base.conf
|
|
||||||
+QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS}
|
|
||||||
+QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}
|
|
||||||
+QMAKE_CXXFLAGS_RELEASE += -O3
|
|
||||||
+CONFIG += nostrip
|
|
||||||
+
|
|
||||||
+QMAKE_LIBS += -lrt -lpthread -ldl
|
|
||||||
+
|
|
||||||
+include(../common/linux_device_post.conf)
|
|
||||||
+load(qt_config)
|
|
||||||
Index: b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+#include "../../linux-g++/qplatformdefs.h"
|
|
24
package/qt5/qt5base/qmake.conf
Normal file
24
package/qt5/qt5base/qmake.conf
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# Qt5 has a mechanism to support "device" profiles, so that people can
|
||||||
|
# specify the compiler, compiler flags and so on for a specific device.
|
||||||
|
|
||||||
|
# We leverage this mechanism in the Buildroot packaging of qt5 to
|
||||||
|
# simplify cross-compilation: we have our own "device" definition, which
|
||||||
|
# allows us to easily pass the cross-compiler paths and flags from our
|
||||||
|
# qt5.mk.
|
||||||
|
|
||||||
|
include(../common/linux_device_pre.conf)
|
||||||
|
|
||||||
|
# modifications to g++-unix.conf
|
||||||
|
QMAKE_CC = $${CROSS_COMPILE}gcc
|
||||||
|
QMAKE_CXX = $${CROSS_COMPILE}g++
|
||||||
|
|
||||||
|
# modifications to gcc-base.conf
|
||||||
|
QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS}
|
||||||
|
QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}
|
||||||
|
QMAKE_CXXFLAGS_RELEASE += -O3
|
||||||
|
CONFIG += nostrip
|
||||||
|
|
||||||
|
QMAKE_LIBS += -lrt -lpthread -ldl
|
||||||
|
|
||||||
|
include(../common/linux_device_post.conf)
|
||||||
|
load(qt_config)
|
1
package/qt5/qt5base/qplatformdefs.h
Normal file
1
package/qt5/qt5base/qplatformdefs.h
Normal file
@ -0,0 +1 @@
|
|||||||
|
#include "../../linux-g++/qplatformdefs.h"
|
@ -179,6 +179,10 @@ endef
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
define QT5BASE_CONFIGURE_CMDS
|
define QT5BASE_CONFIGURE_CMDS
|
||||||
|
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \
|
||||||
|
$(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
|
||||||
|
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \
|
||||||
|
$(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
|
||||||
$(QT5BASE_CONFIGURE_CONFIG_FILE)
|
$(QT5BASE_CONFIGURE_CONFIG_FILE)
|
||||||
(cd $(@D); \
|
(cd $(@D); \
|
||||||
$(TARGET_MAKE_ENV) \
|
$(TARGET_MAKE_ENV) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user