diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:06 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:06 (GMT) |
| commit | 94f9d75e6817e5169e6e4dd5707ee3ffbf7d3323 (patch) | |
| tree | d2aa7cde5f653b3b4814828f3fb16b5678adf469 | |
| parent | bde693ce48b8310e8acd208ef908f1a4ea014148 (diff) | |
| download | Qt-94f9d75e6817e5169e6e4dd5707ee3ffbf7d3323.zip Qt-94f9d75e6817e5169e6e4dd5707ee3ffbf7d3323.tar.gz Qt-94f9d75e6817e5169e6e4dd5707ee3ffbf7d3323.tar.bz2 | |
Revert "Revert "Link always with -static-libgcc -static-libstdc++""
This reverts commit 45a2a4d8ddd82bbbe825672655c41188dc6141c2.
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | SOURCE/qt-5.12.3-linux-static-gcc-libs.patch | 11 |
2 files changed, 19 insertions, 6 deletions
@@ -41,10 +41,10 @@ ssl.$(ARCH): tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS= && \ - export LDFLAGS=$(CC_LDFLAGS) && \ + export LDFLAGS="-static-libgcc -static-libstdc++" && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ - ./Configure --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ + ./Configure -static-libgcc -static-libstdc++ --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ make $(JOBS) && \ @@ -56,10 +56,10 @@ ssl.$(ARCH): tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS=-fpic && \ - export LDFLAGS=$(CC_LDFLAGS) && \ + export LDFLAGS="-static-libgcc -static-libstdc++" && \ 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 && \ + ./Configure -static-libgcc -static-libstdc++ shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ make $(JOBS) && \ @@ -74,7 +74,8 @@ qt.x86-linux64.shared: cd $(LOCAL_BUILD_PATH) && \ tar -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \ - rm -f config.cache && \ + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch && \ + rm -f config.cache && \ export LDFLAGS=$(CXX_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ @@ -116,7 +117,8 @@ 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) && \ - rm -f config.cache && \ + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch && \ + rm -f config.cache && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ gcc --version && \ diff --git a/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch b/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch new file mode 100644 index 0000000..c9d1806 --- /dev/null +++ b/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/common/linux.conf 2019-04-09 11:51:26.000000000 +0200 ++++ qt-everywhere-src-5.12.3/qtbase/mkspecs/common/linux.conf 2019-06-06 22:21:23.860933853 +0200 +@@ -8,6 +8,8 @@ + + QMAKE_CFLAGS_THREAD += -D_REENTRANT + QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD ++ ++QMAKE_LFLAGS += -static-libgcc -static-libstdc++ + QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections + + QMAKE_LFLAGS_REL_RPATH = -Wl,-z,origin |