mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
78 lines
2.9 KiB
Diff
78 lines
2.9 KiB
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -2513,11 +2513,6 @@
|
|
else
|
|
XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
|
|
fi
|
|
-if [ "$PLATFORM" != "$XPLATFORM" ]; then
|
|
- QT_CROSS_COMPILE=yes
|
|
- QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
|
|
- QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
|
|
-fi
|
|
|
|
if [ "$BUILD_ON_MAC" = "yes" ]; then
|
|
if [ `basename $QMAKESPEC` = "macx-xcode" ] || [ `basename $XQMAKESPEC` = "macx-xcode" ]; then
|
|
@@ -2769,11 +2764,6 @@
|
|
if [ "$CFG_DEV" = "yes" ]; then
|
|
CFG_BUILD_PARTS="$CFG_BUILD_PARTS tests"
|
|
fi
|
|
-
|
|
- # don't build tools by default when cross-compiling
|
|
- if [ "$PLATFORM" != "$XPLATFORM" ]; then
|
|
- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
|
|
- fi
|
|
fi
|
|
for nobuild in $CFG_NOBUILD_PARTS; do
|
|
CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
|
|
diff --git a/mkspecs/devices/common/linux_device_post.conf b/mkspecs/devices/common/linux_device_post.conf
|
|
index f8dbf76..b53c2a2 100644
|
|
--- a/mkspecs/devices/common/linux_device_post.conf
|
|
+++ b/mkspecs/devices/common/linux_device_post.conf
|
|
@@ -1,15 +1,3 @@
|
|
-contains(DISTRO_OPTS, deb-multi-arch) {
|
|
- QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/$${GCC_MACHINE_DUMP} \
|
|
- -Wl,-rpath-link,$$[QT_SYSROOT]/lib/$${GCC_MACHINE_DUMP}
|
|
-}
|
|
-
|
|
-contains(DISTRO_OPTS, hard-float) {
|
|
- COMPILER_FLAGS += -mfloat-abi=hard
|
|
-} else {
|
|
- COMPILER_FLAGS += -mfloat-abi=softfp
|
|
-}
|
|
-
|
|
QMAKE_CFLAGS += $$COMPILER_FLAGS
|
|
QMAKE_CXXFLAGS += $$COMPILER_FLAGS
|
|
|
|
-deviceSanityCheckCompiler()
|
|
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
|
|
index 51f04d9..4794b1e 100644
|
|
--- a/mkspecs/devices/common/linux_device_pre.conf
|
|
+++ b/mkspecs/devices/common/linux_device_pre.conf
|
|
@@ -14,14 +14,3 @@ include(../../common/g++-unix.conf)
|
|
!load(device_config) {
|
|
error(Could not successfully load device configuration)
|
|
}
|
|
-
|
|
-# modifications to g++-unix.conf
|
|
-QMAKE_CC = $${CROSS_COMPILE}gcc
|
|
-QMAKE_CXX = $${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
|
|
--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
|
|
+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
|
|
@@ -11,7 +11,7 @@
|
|
QMAKE_LIBDIR_OPENGL_ES2 = $$[QT_SYSROOT]/opt/vc/lib
|
|
QMAKE_LIBDIR_EGL = $$QMAKE_LIBDIR_OPENGL_ES2
|
|
|
|
-QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/opt/vc/include $$[QT_SYSROOT]/opt/vc/include/interface/vcos/pthreads
|
|
+QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/opt/vc/include $$[QT_SYSROOT]/opt/vc/include/interface/vcos/pthreads $$[QT_SYSROOT]/opt/vc/include/interface/vmcs_host/linux
|
|
QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
|
|
|
|
QMAKE_LIBS_EGL = -lEGL -lGLESv2
|
|
|