Mercurial > mxe-octave

changeset 4498:f47df619cd1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtbase: don't strip, only disable xcb on windows.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Oct 2017 05:34:32 -0400
parents e7d902eeefda
children c10c61a3222c
files src/qtbase.mk
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/qtbase.mk	Tue Oct 10 05:31:43 2017 -0400
+++ b/src/qtbase.mk	Tue Oct 10 05:34:32 2017 -0400
@@ -35,12 +35,15 @@
 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
+$(PKG)_CONFIGURE_OPTS :=
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
+  $(PKG)_CONFIGURE_OPTS += -no-xcb
 else
   $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
+  $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
 endif
 
 ## These are needed whether cross compiling or not.
@@ -78,6 +81,7 @@
         ./configure \
             $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
             $($(PKG)_CONFIGURE_LIBPATH_OPTION) \
+            -no-strip \
             -opensource \
             -c++std c++11 \
             -confirm-license \
@@ -86,7 +90,6 @@
             -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
             -force-pkg-config \
             -no-use-gold-linker \
-            -release \
             -shared \
             $($(PKG)_CONFIGURE_PREFIX_OPTION) \
             -hostprefix '$(BUILD_TOOLS_PREFIX)' \
@@ -106,8 +109,7 @@
             -system-pcre \
             -no-openssl \
             -dbus-linked \
-	    -no-pch \
-            -no-xcb \
+            -no-pch \
             -v \
             $($(PKG)_CONFIGURE_OPTS)