From 4339b0f41a4f8d755356bbae7e752ca3ceb0dd83 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Mon, 13 May 2019 23:30:31 +0200
Subject: Fixed working directories

Change-Id: Ia2a52e273526a482532e6ec21e991bb32eb4f2a5
---
 Makefile | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 77c0515..1c38b77 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,13 @@ SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz
 
 PACKAGE_NAME = qt-$(VERSION)
 
-GCC_PATH	= /opt/dev-tools/gcc/8.2.0/x86-linux64/gcc-8.2.0
+GCC_PATH	?= /opt/dev-tools/gcc/8.2.0/x86-linux64/gcc-8.2.0
 
-CC	?= gcc 
-CXX	?= g++ 
+CC	?= $(GCC_PATH)/bin/gcc 
+CXX	?= $(GCC_PATH)/bin/g++ 
 
-CC_LDFLAGS	= "-m64 -static-libgcc"
-CXX_LDFLAGS	= "-m64 -static-libgcc -static-libstdc++"
+#CC_LDFLAGS	= "-m64 -shared -fpic -static-libgcc"
+#CXX_LDFLAGS	= "-m64 -shared -fpic -static-libgcc -static-libstdc++"
 
 QT_STATIC_FLAGS = -static -static-runtime -no-shared
 
@@ -40,8 +40,10 @@ ssl.$(ARCH):
 	cd $(LOCAL_BUILD_PATH) && \
 		tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE)
 	cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \
-	    export CFLAGS= && \
+	    export CFLAGS=  && \
 	    export LDFLAGS=$(CC_LDFLAGS) && \
+	    export PATH=$(GCC_PATH)/bin:$(PATH) && \
+	    export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \
 	    ./Configure --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \
 	    pwd && \
 	    make clean && \
@@ -55,6 +57,8 @@ ssl.$(ARCH):
 	cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \
 	    export CFLAGS=-fpic && \
 	    export LDFLAGS=$(CC_LDFLAGS) && \
+	    export PATH=$(GCC_PATH)/bin:$(PATH) && \
+	    export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \
 	    ./Configure shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \
 	    pwd && \
 	    make clean && \
@@ -72,8 +76,12 @@ qt.x86-linux64.shared:
 	cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \
 	rm -f config.cache && \
 	export LDFLAGS=$(CXX_LDFLAGS) && \
+        export PATH=$(GCC_PATH)/bin:$(PATH) && \
+        export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \
+	gcc --version && \
 	bash ./configure \
 		-recheck-all \
+		-shared \
 		-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \
 		-release \
 		-opensource \
@@ -82,6 +90,7 @@ qt.x86-linux64.shared:
 		-openssl \
 		-I$(LOCAL_INST_PATH)/openssl/include \
 		-L$(LOCAL_INST_PATH)/openssl/lib \
+		-L$(GCC_PATH)/lib64 \
 		-nomake examples \
 		-nomake tests \
 		-skip qtwebengine \
@@ -93,7 +102,7 @@ qt.x86-linux64.shared:
 		-fontconfig \
 		-system-freetype \
 		-confirm-license && \
-	make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) LDFLAGS=$(CXX_LDFLAGS) && \
+	make -j$(JOBS) && \
 	make -j$(JOBS) install
 	cd  $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \
 	    tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./
@@ -105,9 +114,10 @@ qt.x86-linux64.static:
 	cd $(LOCAL_BUILD_PATH) && \
 		tar -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz
 	cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \
-	gcc --version && \
 	rm -f config.cache && \
-	export LDFLAGS=$(CXX_LDFLAGS) && \
+        export PATH=$(GCC_PATH)/bin:$(PATH) && \
+        export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \
+	gcc --version && \
 	./configure \
 		-recheck-all \
 		-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-static \
@@ -119,6 +129,7 @@ qt.x86-linux64.static:
 		-openssl \
 		-I$(LOCAL_INST_PATH)/openssl/include \
 		-L$(LOCAL_INST_PATH)/opensll/lib \
+		-L$(GCC_PATH)/lib64 \
 		-nomake examples \
 		-nomake tests \
 		-skip qtwebengine \
@@ -130,7 +141,7 @@ qt.x86-linux64.static:
 		-fontconfig \
 		-system-freetype \
 		-confirm-license && \
-	make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) LDFLAGS=$(CXX_LDFLAGS) && \
+	make -j$(JOBS) && \
 	make -j$(JOBS) install
 	cd  $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \
 	    tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./
-- 
cgit v0.12