diff --git a/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch b/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch new file mode 100644 index 0000000000..3519b5ecc9 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch @@ -0,0 +1,49 @@ +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 ++++ qtbase-opensource-src-5.5.1/mkspecs/common/g++-base.conf 2015-10-18 00:30:49.000000000 +0300 +@@ -10,15 +10,19 @@ + + QMAKE_COMPILER = gcc + +-QMAKE_CC = gcc ++QMAKE_CC = PISILINUX_CC + + QMAKE_LINK_C = $$QMAKE_CC + QMAKE_LINK_C_SHLIB = $$QMAKE_CC + +-QMAKE_CXX = 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_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 ++++ qtbase-opensource-src-5.5.1/mkspecs/common/g++-unix.conf 2015-10-18 00:31:47.000000000 +0300 +@@ -10,5 +10,5 @@ + + include(g++-base.conf) + +-QMAKE_LFLAGS_RELEASE += -Wl,-O1 ++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 ++++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf 2015-10-18 00:33:07.000000000 +0300 +@@ -49,7 +49,7 @@ QMAKE_OBJCOPY = objcopy + QMAKE_NM = nm -P + QMAKE_RANLIB = + +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + + include(unix.conf) diff --git a/desktop/toolkit/qt5/qt5-base/files/mkspecs1.patch b/desktop/toolkit/qt5/qt5-base/files/mkspecs1.patch deleted file mode 100644 index 2f863e9938..0000000000 --- a/desktop/toolkit/qt5/qt5-base/files/mkspecs1.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- g++-base.conf 2014-12-05 18:24:38.000000000 +0200 -+++ qtbase-opensource-src-5.5.1/mkspecs/common/g++-base.conf 2015-02-16 12:34:43.603049664 +0200 -@@ -10,17 +10,22 @@ - - QMAKE_COMPILER = gcc - --QMAKE_CC = gcc -+QMAKE_CC = PISILINUX_CC - - QMAKE_LINK_C = $$QMAKE_CC - QMAKE_LINK_C_SHLIB = $$QMAKE_CC - --QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g -+QMAKE_CFLAGS_RELEASE += PISILINUX_CFLAGS -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += PISILINUX_CFLAGS -g - --QMAKE_CXX = 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_LFLAGS_RELEASE += PISILINUX_LDFLAGS - - QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO - diff --git a/desktop/toolkit/qt5/qt5-base/files/mkspecs2.patch b/desktop/toolkit/qt5/qt5-base/files/mkspecs2.patch deleted file mode 100644 index 704677c010..0000000000 --- a/desktop/toolkit/qt5/qt5-base/files/mkspecs2.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- g++-unix.conf 2015-02-16 12:35:34.978050836 +0200 -+++ qtbase-opensource-src-5.5.1/mkspecs/common/g++-unix.conf 2015-02-16 12:35:58.703051378 +0200 -@@ -10,5 +10,5 @@ - - include(g++-base.conf) - --QMAKE_LFLAGS_RELEASE += -Wl,-O1 -+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS - QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined diff --git a/desktop/toolkit/qt5/qt5-base/files/mkspecs3.patch b/desktop/toolkit/qt5/qt5-base/files/mkspecs3.patch deleted file mode 100644 index 64049e8e84..0000000000 --- a/desktop/toolkit/qt5/qt5-base/files/mkspecs3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux.conf 2014-12-05 18:24:38.000000000 +0200 -+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf 2015-02-16 12:36:52.547052606 +0200 -@@ -49,7 +49,7 @@ - QMAKE_NM = nm -P - QMAKE_RANLIB = - --QMAKE_STRIP = strip -+QMAKE_STRIP = - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_INSTALL_FILE = install -m 644 -p - QMAKE_INSTALL_PROGRAM = install -m 755 -p diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml index 1d05814a4e..fb0c6d42d6 100644 --- a/desktop/toolkit/qt5/qt5-base/pspec.xml +++ b/desktop/toolkit/qt5/qt5-base/pspec.xml @@ -68,9 +68,10 @@ - mkspecs1.patch + mkspecs.patch +