summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-13 08:16:11 (GMT)
committerJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-13 08:16:11 (GMT)
commit86611187b8270f665c15441eba1ef1b4b6d56e81 (patch)
treea4dbb5dcc8e0cb1c849524fbcd6f57a069a07a67 /Makefile
parent943f545766d876c03fbe608b33134c90c158f28a (diff)
downloadQt-86611187b8270f665c15441eba1ef1b4b6d56e81.zip
Qt-86611187b8270f665c15441eba1ef1b4b6d56e81.tar.gz
Qt-86611187b8270f665c15441eba1ef1b4b6d56e81.tar.bz2
Fixed working directories
Change-Id: I116dfe2d0512e0e3dd28145f683253251d74b1e4
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 207f867..da1e62c 100644
--- a/Makefile
+++ b/Makefile
@@ -88,11 +88,10 @@ qt.x86-linux64.shared:
-qt-libpng \
-qt-pcre \
-qt-xcb \
- -silent \
-fontconfig \
-system-freetype \
-confirm-license && \
- make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) && \
+ make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) LDFLAGS=$(CXX_LDFLAGS) && \
make -j$(JOBS) install
cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \
tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./
@@ -107,7 +106,7 @@ qt.x86-linux64.static:
gcc --version && \
rm -f config.cache && \
export LDFLAGS=$(CXX_LDFLAGS) && \
- bash ./configure \
+ ./configure \
-recheck-all \
-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-static \
-static \
@@ -126,11 +125,10 @@ qt.x86-linux64.static:
-qt-libjpeg \
-qt-libpng \
-qt-pcre \
- -silent \
-fontconfig \
-system-freetype \
-confirm-license && \
- make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) && \
+ make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) LDFLAGS=$(CXX_LDFLAGS) && \
make -j$(JOBS) install
cd $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \
tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./