Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-base kde_patch

Browse Source
This commit is contained in:
Rmys
2021-11-16 13:35:05 +02:00
committed by GitHub
parent b291cdb0aa
commit 870cccea0c
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-base/files/mkspecs.patch
+21 -23
View File
@@ -1,49 +1,47 @@
diff -Nurp qtbase-opensource/mkspecs/common/g++-base.conf qtbase-opensourcey/mkspecs/common/g++-base.conf
--- qtbase-opensource/mkspecs/common/g++-base.conf 2015-10-13 07:35:32.000000000 +0300
+++ mkspecs/common/g++-base.conf 2015-10-18 00:30:49.000000000 +0300
@@ -10,15 +10,19 @@
diff -Nuar a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf
--- a/mkspecs/common/g++-base.conf 2021-11-15 00:00:01.000000000 +0200
+++ b/mkspecs/common/g++-base.conf 2021-11-15 22:49:20.969099951 +0200
@@ -10,15 +10,17 @@
QMAKE_COMPILER = gcc
-QMAKE_CC = gcc
-QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CC = PISILINUX_CC
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
-QMAKE_LINK_C = $$QMAKE_CC
-QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+QMAKE_LINK_C = PISILINUX_CC
+QMAKE_LINK_C_SHLIB = PISILINUX_CC
-QMAKE_CXX = g++
-QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_CXX = PISILINUX_CXX
-QMAKE_LINK = $$QMAKE_CXX
-QMAKE_LINK_SHLIB = $$QMAKE_CXX
+QMAKE_LINK = PISILINUX_CXX
+QMAKE_LINK_SHLIB = PISILINUX_CXX
+QMAKE_LINK_C = PISILINUX_CC
+QMAKE_LINK_C_SHLIB = PISILINUX_CC
+QMAKE_LINK = PISILINUX_CXX
+QMAKE_LINK_SHLIB = PISILINUX_CXX
+
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_PCH_OUTPUT_EXT = .gch
diff -Nurp qtbase-opensource/mkspecs/common/g++-unix.conf qtbase-opensourcey/mkspecs/common/g++-unix.conf
--- qtbase-opensource/mkspecs/common/g++-unix.conf 2015-10-13 07:35:32.000000000 +0300
+++ mkspecs/common/g++-unix.conf 2015-10-18 00:31:47.000000000 +0300
diff -Nuar a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
--- a/mkspecs/common/g++-unix.conf 2021-11-15 00:00:01.000000000 +0200
+++ b/mkspecs/common/g++-unix.conf 2021-11-15 22:51:51.058450056 +0200
@@ -10,5 +10,5 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff -Nurp qtbase-opensource/mkspecs/common/linux.conf qtbase-opensourcey/mkspecs/common/linux.conf
--- qtbase-opensource/mkspecs/common/linux.conf 2015-10-13 07:35:32.000000000 +0300
+++ mkspecs/common/linux.conf 2015-10-18 00:33:07.000000000 +0300
@@ -49,7 +49,7 @@ QMAKE_OBJCOPY = objcopy
diff -Nuar a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
--- a/mkspecs/common/linux.conf 2021-11-15 00:00:01.000000000 +0200
+++ b/mkspecs/common/linux.conf 2021-11-15 22:52:35.802019704 +0200
@@ -48,5 +48,5 @@
QMAKE_NM = nm -P
QMAKE_RANLIB =
-QMAKE_STRIP = strip
+QMAKE_STRIP =
+QMAKE_STRIP =
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
include(unix.conf)