diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | SOURCE/qt-5.12.3-linux-static-gcc-libs.patch | 11 |
2 files changed, 6 insertions, 19 deletions
@@ -41,10 +41,10 @@ ssl.$(ARCH): tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS= && \ - export LDFLAGS="-static-libgcc -static-libstdc++" && \ + export LDFLAGS=$(CC_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ - ./Configure -static-libgcc -static-libstdc++ --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ + ./Configure --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="-static-libgcc -static-libstdc++" && \ + export LDFLAGS=$(CC_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ - ./Configure -static-libgcc -static-libstdc++ shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ + ./Configure shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ make $(JOBS) && \ @@ -74,8 +74,7 @@ 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) && \ - patch -p1 < $(TOP)/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch && \ - rm -f config.cache && \ + rm -f config.cache && \ export LDFLAGS=$(CXX_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ @@ -117,8 +116,7 @@ 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) && \ - patch -p1 < $(TOP)/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch && \ - rm -f config.cache && \ + 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 deleted file mode 100644 index c9d1806..0000000 --- a/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 |