summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-26 13:26:05 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-26 13:26:05 (GMT)
commitc6b16b7e4d20734f2ac2fa465badd1121b6a6738 (patch)
tree3a338a67c56a8d6e835811bc1c4481eac7956f0e /Makefile
parent386a4c8a8170b57ec347fc516262ff496e113f5d (diff)
downloadQt-c6b16b7e4d20734f2ac2fa465badd1121b6a6738.zip
Qt-c6b16b7e4d20734f2ac2fa465badd1121b6a6738.tar.gz
Qt-c6b16b7e4d20734f2ac2fa465badd1121b6a6738.tar.bz2
Last stand from QT_5_14refs/changes/82/11082/1
Change-Id: If8cf86e542691fed458098021c042193c4679d14
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ce9f605..3286075 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH)
LOCAL_INST_PATH = $(TOP)/install.$(ARCH)
VERSION_SHORT=5.14
-VERSION_RELEASE=0
+VERSION_RELEASE=2
VERSION=$(VERSION_SHORT).$(VERSION_RELEASE)
SSL_VERSION=1.0.2r
@@ -16,7 +16,7 @@ SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz
PACKAGE_NAME = qt-$(VERSION)
-GCC_PATH ?= /opt/dev-tools/gcc-suite/1.5.0/x86-linux64/gcc
+GCC_PATH ?= /opt/dev-tools/gcc-suite/1.6.0/x86-linux64/gcc
CC ?= $(GCC_PATH)/bin/gcc
CXX ?= $(GCC_PATH)/bin/g++
@@ -86,6 +86,9 @@ qt.x86-linux64.shared:
-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \
-release \
-opensource \
+ -no-rpath \
+ -silent \
+ -no-rpath \
-strip \
-ssl \
-openssl \
@@ -130,6 +133,8 @@ qt.x86-linux64.static:
-strip \
-ssl \
-openssl \
+ -silent \
+ -no-rpath \
-I$(LOCAL_INST_PATH)/openssl/include \
-L$(LOCAL_INST_PATH)/opensll/lib \
-L$(GCC_PATH)/lib64 \