Mercurial > mxe-octave

diff 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
line wrap: on
line diff
--- a/src/qtbase.mk	Thu Jun 07 09:55:39 2018 -0400
+++ b/src/qtbase.mk	Fri Jun 22 08:28:05 2018 -0400
@@ -3,12 +3,12 @@
 
 PKG             := qtbase
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.7.1
-$(PKG)_CHECKSUM := a3ddcde8978d3a05bb4342fce364a792472a16e6
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
-$(PKG)_DEPS     := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre postgresql sqlite zlib
+$(PKG)_VERSION  := 5.11.0
+$(PKG)_CHECKSUM := 277bfe3ebbead8096f6a16416db522179404d41e
+$(PKG)_SUBDIR   := $(PKG)-everywhere-src-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_DEPS     := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib
 
 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
 $(PKG)_CONFIGURE_DATABASE_OPTION :=
@@ -88,6 +88,11 @@
   endif
 endif
 
+$(PKG)_CONFIGURE_ENV += \
+    PKG_CONFIG="$(MXE_PKG_CONFIG)" \
+    PKG_CONFIG_SYSROOT_DIR="/" \
+    PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)"
+
 define $(PKG)_BUILD
     cd '$(1)' && \
         $($(PKG)_CONFIGURE_ENV) \
@@ -101,6 +106,7 @@
             $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
             $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
             -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
+            -pkg-config \
             -force-pkg-config \
             -no-use-gold-linker \
             -shared \