diff options
Diffstat (limited to 'Makefile.mingw64')
| -rw-r--r-- | Makefile.mingw64 | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64 index bbd0280..d0a76f9 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -6,7 +6,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) VERSION_SHORT = 5.13 -VERSION_RELEASE = 1 +VERSION_RELEASE = 2 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION = 1.0.2r @@ -19,9 +19,14 @@ QT_SRC_PATH = $(QT_BUILD_PATH)/qt-src GCC = $(shell which g++) GCC_PATH = $(shell dirname $(GCC)) +7ZIP = $(TOP)/wintools/7za.exe PACKAGE_NAME = qt-$(VERSION)-$(ARCH) +test: + echo $(ProgramW6432) + echo $(7ZIP) + all: download ssl qt ssl: ssl.$(ARCH) @@ -34,7 +39,7 @@ ssl.$(ARCH): rm -Rf $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) mkdir -p $(LOCAL_BUILD_PATH)/ cd $(LOCAL_BUILD_PATH) && \ - tar --force-local -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) + tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS="-m64 -fpic" && \ ./Configure --prefix=$(QT_INST_PATH) shared mingw64 && \ @@ -44,13 +49,13 @@ ssl.$(ARCH): qt.$(ARCH): mkdir -p $(LOCAL_BUILD_PATH) - rm -Rf $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) - if ! [ -d $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ]; then \ - cd $(LOCAL_BUILD_PATH); \ - tar --force-local -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-cross-static-gcc-libs.patch ; \ + if [ -d $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ]; then \ + rm -Rf $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ; \ fi + cd $(LOCAL_BUILD_PATH); \ + $(7ZIP) x $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz -so | $(7ZIP) x -aoa -si -ttar -o"." + cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ;\ + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch rm -Rf $(QT_SRC_PATH) mv $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) $(QT_SRC_PATH) # be sure, that python, msys-tools and gcc are in PATH @@ -92,7 +97,7 @@ qt.$(ARCH): $(QT_INST_PATH)/bin/qt-openssl.exe cp -f $(GCC_PATH)/../x86_64-w64-mingw32/bin/libwinpthread-1.dll $(QT_INST_PATH)/bin/ cd $(QT_INST_PATH)/ && \ - tar --force-local -zcf $(TOP)/$(PACKAGE_NAME).tgz ./ + tar -czf $(TOP)/$(PACKAGE_NAME).tgz . rm -Rf $(QT_INST_PATH) rm -Rf $(QT_SRC_PATH) |