Merged from origin/masterrefs/changes/21/11121/1

Change-Id: Id41004ef96115a131272e331251a5bd078038753

6 files changed, 29 insertions, 25 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 60dbabf..8dd3a0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -129,32 +129,42 @@ stage ("Post processing") {
 
 	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64-shared
 	    tar -xzf $WORKSPACE/qt-$QT_VER-shared-x86-linux64.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux64-shared
+	    rm -f $WORKSPACE/qt-$QT_VER-shared-x86-linux64.tgz
+	    cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin
+
 	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64-static
 	    tar -xzf $WORKSPACE/qt-$QT_VER-static-x86-linux64.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux64-static
+	    rm -f $WORKSPACE/qt-$QT_VER-static-x86-linux64.tgz
+	    cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin
 
 	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64
 	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64
-	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64
-	    cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64
+	    rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz
+	    cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-mingw64/bin
+	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
+	    cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/linguist
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/designer
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/assistant
 
 	    mkdir -p $WORKSPACE/INST/$QT_VER/x86_64-msvc
-	    unzip -o $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc
+	    unzip -qo $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc
+	    rm -f $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip
+	    cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86_64-msvc/bin
 
-	    # generate qt.conf for linux to windows cross builds ...
-	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    echo "[Paths]"                 > $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    echo "Prefix=.."              >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    echo "Libraries = lib"        >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    echo "Plugins = plugins"      >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    echo "HostBinaries=xbin"      >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    echo "TargetSpec=win32-g++"   >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
-	    cp -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf \
-		$WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/
 	    # 
-	    # finally recreate the whole mingw64-shared archive ...
-	    rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz
+	    # finally recreate packages ...
 	    cd $WORKSPACE/INST/$QT_VER/x86-mingw64
-	    tar -zcf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz .
+	    zip -qr $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-x86-mingw64.zip .
+
+	    cd $WORKSPACE/INST/$QT_VER/x86-linux64-shared
+	    tar -zcf $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-x86-linux64-shared.tgz .
+
+	    cd $WORKSPACE/INST/$QT_VER/x86-linux64-static
+	    tar -zcf $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-x86-linux64-static.tgz .
+
+	    cd $WORKSPACE/INST/$QT_VER/x86_64-msvc
+	    zip -qr $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-x86_64-msvc.zip .
 
 	    cd $WORKSPACE/
 	    rm -Rf $WORKSPACE/INST
diff --git a/Makefile b/Makefile
index 3286075..79493d3 100644
--- a/Makefile
+++ b/Makefile
@@ -86,9 +86,7 @@ qt.x86-linux64.shared:
 		-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \
 		-release \
 		-opensource \
-		-no-rpath \
 		-silent \
-		-no-rpath \
 		-strip \
 		-ssl \
 		-openssl \
@@ -134,7 +132,6 @@ qt.x86-linux64.static:
 		-ssl \
 		-openssl \
 		-silent \
-		-no-rpath \
 		-I$(LOCAL_INST_PATH)/openssl/include \
 		-L$(LOCAL_INST_PATH)/opensll/lib \
 		-L$(GCC_PATH)/lib64 \
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index fed71f4..841399f 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -72,7 +72,6 @@ qt.$(ARCH):
 			-release \
 			-strip \
 			-silent \
-			-no-rpath \
 			-no-pch \
 			-ssl \
 			-nomake examples \
@@ -104,6 +103,8 @@ qt.$(ARCH):
 	mv -f $(QT_INST_PATH)/bin/openssl.exe \
 	    $(QT_INST_PATH)/bin/qt-openssl.exe
 	cp -f $(GCC_PATH)/../x86_64-w64-mingw32/bin/libwinpthread-1.dll $(QT_INST_PATH)/bin/
+	cp -f $(GCC_PATH)/../lib/gcc/x86_64-w64-mingw32/libgcc_s_seh-1.dll $(QT_INST_PATH)/bin/
+	cp -f $(GCC_PATH)/../bin/*.dll $(QT_INST_PATH)/bin/
 	cd  $(QT_INST_PATH)/ && \
 	    tar -czf $(TOP)/$(PACKAGE_NAME).tgz .
 ifeq ($(RESERVE_INSTDIR),0)
diff --git a/Makefile.x86-linux b/Makefile.x86-linux
index 0bc6b0d..7aa0b22 100644
--- a/Makefile.x86-linux
+++ b/Makefile.x86-linux
@@ -87,7 +87,6 @@ qt.x86-linux.shared:
 		-opensource \
 		-strip \
 		-silent \
-		-no-rpath \
 		-ssl \
 		-openssl \
 		-I$(LOCAL_INST_PATH)/openssl/include \
@@ -130,7 +129,6 @@ qt.x86-linux.static:
 		-ssl \
 		-openssl \
 		-silent \
-		-no-rpath \
 		-I$(LOCAL_INST_PATH)/openssl/include \
 		-L$(LOCAL_INST_PATH)/opensll/lib \
 		-L$(GCC_PATH)/lib \
diff --git a/Makefile.xmingw64 b/Makefile.xmingw64
index 68c1416..1a48e07 100644
--- a/Makefile.xmingw64
+++ b/Makefile.xmingw64
@@ -98,7 +98,6 @@ qt.x86-mingw64.shared:
 		-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \
 		-release \
 		-opensource \
-		-no-rpath \
 		-strip \
 		-ssl \
 		-openssl \
@@ -145,7 +144,6 @@ qt.x86-mingw64.static:
 		-strip \
 		-ssl \
 		-openssl \
-		-no-rpath \
 		-I$(LOCAL_INST_PATH)/openssl/include \
 		-L$(LOCAL_INST_PATH)/opensll/lib \
 		-nomake examples \
diff --git a/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch b/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch
index 912a5e1..017c5a9 100644
--- a/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch
+++ b/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch
@@ -6,7 +6,7 @@ diff -ruNb qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/common/g++-win32.conf qt
  include(angle.conf)
  include(windows-vulkan.conf)
 +
-+QMAKE_LFLAGS            += -static-libgcc -static-libstdc++ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive -Wl,-Bdynamic
++QMAKE_LFLAGS            += -static-libgcc -static-libstdc++
 diff -ruNb qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/x-win32-g++/qmake.conf qt-everywhere-src-5.12.3/qtbase/mkspecs/x-win32-g++/qmake.conf
 --- qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/x-win32-g++/qmake.conf	1970-01-01 01:00:00.000000000 +0100
 +++ qt-everywhere-src-5.12.3/qtbase/mkspecs/x-win32-g++/qmake.conf	2019-05-31 08:59:13.555027712 +0200