[patch] qtbase-by-qt5-build.eclass.diff

qtbase-by-qt5-build.eclass.diff (text/plain), 2.97 KB, created by Andreas Sturmlechner on 2020-06-03 18:06:36 UTC

diff --git a/configure b/configure
index b6c9b462..378f421e 100755
--- a/configure
+++ b/configure
@@ -712,6 +712,7 @@ setBootstrapVariable()
 }
 
 # build qmake
+if [ '!' -e "$outpath/bin/qmake" ]; then
     echo "Creating qmake..."
     mkdir -p "$outpath/qmake" || exit
 
@@ -738,11 +739,11 @@ setBootstrapVariable()
         setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
 
         if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
-            setBootstrapVariable QMAKE_CXXFLAGS_RELEASE
-            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
+            :
+            :
         else
-            setBootstrapVariable QMAKE_CXXFLAGS_DEBUG
-            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
+            :
+            :
         fi
 
 	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
@@ -795,7 +796,7 @@ setBootstrapVariable()
 
     if [ "$OPT_VERBOSE" = yes ]; then
         # Show the output of make
-        (cd "$outpath/qmake"; "$MAKE") || exit 2
+        (cd "$outpath/qmake"; "$MAKE" 			-j4  'CC=x86_64-pc-linux-gnu-gcc' 'CXX=x86_64-pc-linux-gnu-g++' 			'QMAKE_CFLAGS=-O2 -march=native -pipe -ggdb' 'QMAKE_CXXFLAGS=-O2 -march=native -pipe -ggdb' 'QMAKE_LFLAGS=-Wl,-O1 -Wl,--as-needed') || exit 2
     else
         # Hide the output of make
         # Use bash to print dots, if we have it, and stdout is a tty.
@@ -808,6 +809,7 @@ setBootstrapVariable()
             (cd "$outpath/qmake"; "$MAKE" -s) || exit 2
         fi
         echo "Done."
+fi
     fi
 
 #-------------------------------------------------------------------------------
@@ -853,5 +855,5 @@ fi
 if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
     "$CFG_HOST_QT_TOOLS_PATH/qmake" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@"
 else
-    "$outpath/bin/qmake" "$relpathMangled" -- "$@"
+    "$outpath/bin/qmake" "$relpathMangled" -- "$@" QMAKE_AR="x86_64-pc-linux-gnu-ar" QMAKE_CC="x86_64-pc-linux-gnu-gcc" QMAKE_LINK_C="x86_64-pc-linux-gnu-gcc" QMAKE_LINK_C_SHLIB="x86_64-pc-linux-gnu-gcc" QMAKE_CXX="x86_64-pc-linux-gnu-g++" QMAKE_LINK="x86_64-pc-linux-gnu-g++" QMAKE_LINK_SHLIB="x86_64-pc-linux-gnu-g++" QMAKE_OBJCOPY="x86_64-pc-linux-gnu-objcopy" QMAKE_RANLIB= QMAKE_STRIP="x86_64-pc-linux-gnu-strip" QMAKE_CFLAGS="-O2 -march=native -pipe -ggdb" QMAKE_CFLAGS_RELEASE= QMAKE_CFLAGS_DEBUG= QMAKE_CXXFLAGS="-O2 -march=native -pipe -ggdb" QMAKE_CXXFLAGS_RELEASE= QMAKE_CXXFLAGS_DEBUG= QMAKE_LFLAGS="-Wl,-O1 -Wl,--as-needed" QMAKE_LFLAGS_RELEASE= QMAKE_LFLAGS_DEBUG= 
 fi
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 646f5f84..37435031 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -134,7 +134,7 @@ DEPEND_SRC = \
 # by configure); QTSRCS2 may include *.mm entries on macOS.
 # See below for special handling of qlibraryinfo.cpp
 
-CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+CPPFLAGS = $(EXTRA_CPPFLAGS) \
 	   -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
 	   -I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \
 	   -I$(QMKGENSRC)/unix -I$(QMKGENSRC)/win32 -I$(QMKGENSRC)/mac \