diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-31 07:29:38 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-31 07:29:38 (GMT) |
| commit | c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99 (patch) | |
| tree | 739c2daaf2a9ca06686132c3983ea3e38571d15b /Makefile.mingw64 | |
| parent | c0ef01f7801e75a8042268a597f5f79821dfbb10 (diff) | |
| download | Qt-c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99.zip Qt-c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99.tar.gz Qt-c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99.tar.bz2 | |
Fixed MinGW buildrefs/changes/93/7693/1
Change-Id: Ic453a7d5e8e0ff2a1e541ff4b93ae9cac7b5490c
Diffstat (limited to 'Makefile.mingw64')
| -rw-r--r-- | Makefile.mingw64 | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64 index e638416..48e741f 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -1,19 +1,23 @@ -TOP = $(shell readlink -f .) +TOP = $(shell readlink -f .) -ARCH = x86-mingw64 +ARCH = x86-mingw64 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) VERSION_SHORT = 5.12 VERSION_RELEASE = 3 -VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) +VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) -SSL_VERSION = 1.0.2r -SSL_ARCHIVE = openssl-$(SSL_VERSION).tar.gz +SSL_VERSION = 1.0.2r +SSL_ARCHIVE = openssl-$(SSL_VERSION).tar.gz PACKAGE_NAME = qt-$(VERSION)-$(ARCH) +ifeq ($(GCC_PATH),) + $(error GCC_PATH variable not set) +endif + all: download ssl qt ssl: ssl.$(ARCH) @@ -28,8 +32,9 @@ ssl.$(ARCH): cd $(LOCAL_BUILD_PATH) && \ tar --force-local -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ + export PATH=$(GCC_PATH)/bin:$(PATH) && \ export CFLAGS="-m64 -fpic" && \ - ./Configure --prefix=$(LOCAL_INST_PATH)/openssl shared mingw64 && \ + ./Configure --prefix=$(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH) shared mingw64 && \ make clean && \ make && \ make install @@ -38,12 +43,15 @@ 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); \ + 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.mingw64.patch ; \ + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch ; \ fi cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \ rm -f config.cache && \ - patch -p1 < $(TOP)/SOURCE/qt-5.12.3.mingw64.patch && \ + export PATH=$(GCC_PATH)/bin:$(PATH) && \ ./configure \ -platform win32-g++ \ -prefix $(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH) \ @@ -70,13 +78,16 @@ qt.$(ARCH): -qt-freetype \ -opengl desktop \ -openssl \ - -I$(LOCAL_INST_PATH)/openssl/include \ - -L$(LOCAL_INST_PATH)/openssl/lib \ + -I$(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH)/include \ + -L$(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH)/lib \ -L$(GCC_PATH)/lib \ -opensource \ -confirm-license && \ make && \ make install + mv -f $(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH)/bin/openssl.exe \ + $(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH)/bin/qt-openssl.exe + cp -f $(GCC_PATH)/bin/*.dll $(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH)/bin/ cd $(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH) && \ tar --force-local -zcf $(TOP)/$(PACKAGE_NAME).tgz ./ |