Mercurial > mxe-octave

comparison src/qtbase.mk @ 4735:4cea16af20b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: update to v5.11.0, add support pcre2 * src/qtbase.mk: update version, checksum * src/qtimageformats.mk: update checksum * src/qtisvg.mk: update checksum * src/qttools.mk: update checksum * src/qtbase-1-fixes.patch, src/qttools-1.patch: update patch from mxe.cc * src/pcre2.mk: new file * index.html: add pcre2 * src/sqlite.mk: enable column metadata
author John Donoghue
date Fri, 22 Jun 2018 08:28:05 -0400
parents de2eedecd6ba
children 206f76f1b59c
comparison
equal deleted inserted replaced
4732:a492f79fd69a 4735:4cea16af20b4
1 # This file is part of MXE. 1 # This file is part of MXE.
2 # See index.html for further information. 2 # See index.html for further information.
3 3
4 PKG := qtbase 4 PKG := qtbase
5 $(PKG)_IGNORE := 5 $(PKG)_IGNORE :=
6 $(PKG)_VERSION := 5.7.1 6 $(PKG)_VERSION := 5.11.0
7 $(PKG)_CHECKSUM := a3ddcde8978d3a05bb4342fce364a792472a16e6 7 $(PKG)_CHECKSUM := 277bfe3ebbead8096f6a16416db522179404d41e
8 $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION)
9 $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz 9 $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
10 $(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) 10 $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
11 $(PKG)_DEPS := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre postgresql sqlite zlib 11 $(PKG)_DEPS := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib
12 12
13 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := 13 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
14 $(PKG)_CONFIGURE_DATABASE_OPTION := 14 $(PKG)_CONFIGURE_DATABASE_OPTION :=
15 $(PKG)_CONFIGURE_ENV := 15 $(PKG)_CONFIGURE_ENV :=
16 $(PKG)_CONFIGURE_INCLUDE_OPTION := 16 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
86 ifeq ($(MXE_WINDOWS_BUILD),yes) 86 ifeq ($(MXE_WINDOWS_BUILD),yes)
87 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++ 87 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++
88 endif 88 endif
89 endif 89 endif
90 90
91 $(PKG)_CONFIGURE_ENV += \
92 PKG_CONFIG="$(MXE_PKG_CONFIG)" \
93 PKG_CONFIG_SYSROOT_DIR="/" \
94 PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)"
95
91 define $(PKG)_BUILD 96 define $(PKG)_BUILD
92 cd '$(1)' && \ 97 cd '$(1)' && \
93 $($(PKG)_CONFIGURE_ENV) \ 98 $($(PKG)_CONFIGURE_ENV) \
94 ./configure \ 99 ./configure \
95 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ 100 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
99 -c++std c++11 \ 104 -c++std c++11 \
100 -confirm-license \ 105 -confirm-license \
101 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ 106 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
102 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \ 107 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
103 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 108 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
109 -pkg-config \
104 -force-pkg-config \ 110 -force-pkg-config \
105 -no-use-gold-linker \ 111 -no-use-gold-linker \
106 -shared \ 112 -shared \
107 $($(PKG)_CONFIGURE_PREFIX_OPTION) \ 113 $($(PKG)_CONFIGURE_PREFIX_OPTION) \
108 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ 114 -hostprefix '$(BUILD_TOOLS_PREFIX)' \