Mercurial > mxe-octave

changeset 4532:2ef6a1cbd7df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtbase: disable icu on w32 systems
author John W. Eaton <jwe@octave.org>
date Fri, 10 Nov 2017 13:08:28 -0500
parents 18cde9ba832a
children f3fb203b6fca
files src/qtbase.mk
diffstat 1 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/qtbase.mk	Fri Nov 10 11:51:21 2017 -0500
+++ b/src/qtbase.mk	Fri Nov 10 13:08:28 2017 -0500
@@ -8,14 +8,32 @@
 $(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 icu4c jpeg libjbig libpng libproxy pcre postgresql sqlite zlib
+$(PKG)_DEPS     := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre postgresql sqlite zlib
+
+$(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
+$(PKG)_CONFIGURE_DATABASE_OPTION :=
+$(PKG)_CONFIGURE_ENV :=
+$(PKG)_CONFIGURE_INCLUDE_OPTION :=
+$(PKG)_CONFIGURE_LIBPATH_OPTION :=
+$(PKG)_CONFIGURE_PLATFORM_OPTION :=
+$(PKG)_CONFIGURE_OPTS :=
+
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
 ifeq ($(USE_SYSTEM_OPENGL),no)
   $(PKG)_DEPS += mesa
 endif
-ifeq ($(MXE_WINDOWS_BUILD),no)
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  ifeq ($(ENABLE_WINDOWS64),yes)
+    $(PKG)_DEPS += icu4c
+    $(PKG)_CONFIGURE_OPTS += -icu
+  else
+    $(PKG)_CONFIGURE_OPTS += -no-icu
+  endif
+else
+  $(PKG)_DEPS += icu4c
+  $(PKG)_CONFIGURE_OPTS += -icu
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm
   endif
@@ -29,14 +47,6 @@
     tail -1
 endef
 
-$(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
-$(PKG)_CONFIGURE_DATABASE_OPTION :=
-$(PKG)_CONFIGURE_ENV :=
-$(PKG)_CONFIGURE_INCLUDE_OPTION :=
-$(PKG)_CONFIGURE_LIBPATH_OPTION :=
-$(PKG)_CONFIGURE_PLATFORM_OPTION :=
-$(PKG)_CONFIGURE_OPTS :=
-
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   ## I haven't been able to change this to be just $(HOST_PREFIX),
   ## though I would prefer to do that.  If it is changed, then
@@ -96,7 +106,6 @@
             -shared \
             $($(PKG)_CONFIGURE_PREFIX_OPTION) \
             -hostprefix '$(BUILD_TOOLS_PREFIX)' \
-            -icu \
             -opengl desktop \
             -no-glib \
             -accessibility \