From 56adeca7310d73b0002dc0a0dccdb795c96f6e32 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Wed, 5 Jun 2019 21:17:42 +0200
Subject: Fixed MinGW package bundle

- install missing gcc libs (winpthreads)
- create qt.conf file for cross-compiling from linux to windows

Change-Id: I852b52797da266013a4cd757e1e2a061e6c5aa0f
---
 Jenkinsfile      | 9 ++++++++-
 Makefile.mingw64 | 8 ++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b237489..96bed20 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -113,9 +113,16 @@ stage ("Post processing") {
 
 	    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
+	    # generate qt.conf for linux to windows cross builds ...
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+	    echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+	    echo "Prefix=.." >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+	    echo "Libraries = lib" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+	    echo "Plugins = plugins" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+	    echo "HostBinaries=xbin" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
 	    # 
 	    # finally create the whole archive ...
-	    cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-bin_64.tgz ./
+	    cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-bins_64.tgz ./
 	    rm -Rf $WORKSPACE/INST
 	'''
 	archiveArtifacts artifacts: '*.tgz, *.zip'
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 4befeda..7f53b57 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -12,12 +12,16 @@ VERSION			= $(VERSION_SHORT).$(VERSION_RELEASE)
 SSL_VERSION		= 1.0.2r
 SSL_ARCHIVE		= openssl-$(SSL_VERSION).tar.gz
 
-PACKAGE_NAME 		= qt-$(VERSION)-$(ARCH)
 
 QT_BUILD_PATH		= c:/tmp
 QT_INST_PATH		= $(QT_BUILD_PATH)/qt
 QT_SRC_PATH		= $(QT_BUILD_PATH)/qt-src
 
+GCC			= $(shell which g++)
+GCC_PATH		= $(shell dirname $(GCC))
+
+PACKAGE_NAME 		= qt-$(VERSION)-$(ARCH)
+
 all: download ssl qt
  
 ssl: ssl.$(ARCH)
@@ -86,7 +90,7 @@ qt.$(ARCH):
 		make install
 	mv -f $(QT_INST_PATH)/bin/openssl.exe \
 	    $(QT_INST_PATH)/bin/qt-openssl.exe
-	cp -f $(GCC_PATH)/bin/*.dll $(QT_INST_PATH)/bin/
+	cp -f $(GCC_PATH)/x86_64-w64-mingw32/bin/libwinpthread-1.dll $(QT_INST_PATH)/bin/
 	cd  $(QT_INST_PATH)/ && \
 	    tar --force-local -zcf $(TOP)/$(PACKAGE_NAME).tgz ./
 	rm -Rf $(QT_INST_PATH)
-- 
cgit v0.12