diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:08 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:08 (GMT) |
| commit | 11c4b06d74eb553a39198cef17935849ad5118bd (patch) | |
| tree | 3b9b01988ef216c44286a32b11b5a8f84d4b1662 /Makefile | |
| parent | 94f9d75e6817e5169e6e4dd5707ee3ffbf7d3323 (diff) | |
| download | Qt-11c4b06d74eb553a39198cef17935849ad5118bd.zip Qt-11c4b06d74eb553a39198cef17935849ad5118bd.tar.gz Qt-11c4b06d74eb553a39198cef17935849ad5118bd.tar.bz2 | |
Revert "Several Build Fixes; Added Makefile for QtCreator"
This reverts commit 05913e6bd84a963215885319a55ee019a79be482.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 11 insertions, 12 deletions
@@ -2,7 +2,7 @@ TOP = $(shell readlink -f .) ARCH = x86-linux64 -JOBS = -j2 +JOBS = 2 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) @@ -18,11 +18,11 @@ PACKAGE_NAME = qt-$(VERSION) GCC_PATH ?= /opt/dev-tools/gcc-suite/1.3.0/x86-linux64/gcc-8.2.0 -CC = $(GCC_PATH)/bin/gcc -CXX = $(GCC_PATH)/bin/g++ +CC ?= $(GCC_PATH)/bin/gcc +CXX ?= $(GCC_PATH)/bin/g++ -#CC_LDFLAGS = -m64 -shared -fpic -static-libgcc -#CXX_LDFLAGS = $(CC_LDFLAGS) -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 @@ -47,7 +47,7 @@ ssl.$(ARCH): ./Configure -static-libgcc -static-libstdc++ --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ - make $(JOBS) && \ + make -j$(JOBS) && \ make install # shared rm -Rf $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) @@ -62,7 +62,7 @@ ssl.$(ARCH): ./Configure -static-libgcc -static-libstdc++ shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ - make $(JOBS) && \ + make -j$(JOBS) && \ make install qt.x86-linux64: qt.x86-linux64.shared qt.x86-linux64.static merge @@ -88,7 +88,6 @@ qt.x86-linux64.shared: -opensource \ -strip \ -ssl \ - -gtk \ -openssl \ -I$(LOCAL_INST_PATH)/openssl/include \ -L$(LOCAL_INST_PATH)/openssl/lib \ @@ -104,8 +103,8 @@ qt.x86-linux64.shared: -fontconfig \ -system-freetype \ -confirm-license && \ - make $(JOBS) && \ - make $(JOBS) install + make -j$(JOBS) && \ + make -j$(JOBS) install cp -f $(TOP)/qt.conf $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/bin/ cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./ @@ -145,8 +144,8 @@ qt.x86-linux64.static: -fontconfig \ -system-freetype \ -confirm-license && \ - make $(JOBS) && \ - make $(JOBS) install + make -j$(JOBS) && \ + make -j$(JOBS) install cp -f $(TOP)/qt.conf $(LOCAL_INST_PATH)/qt-$(VERSION)-static/bin/ cd $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \ tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./ |