Mercurial > mxe-octave

diff src/qtbase.mk @ 4526:c283aa086767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
double-conversion: new package * src/double-conversion.mk: new file * index.html: add double-conversion * src/qtbase.mk: enable system double-conversion and add as dependancy
author John D
date Wed, 08 Nov 2017 08:20:54 -0500
parents 0deb76a57fae
children 2ef6a1cbd7df
line wrap: on
line diff
--- a/src/qtbase.mk	Wed Nov 08 08:20:51 2017 -0500
+++ b/src/qtbase.mk	Wed Nov 08 08:20:54 2017 -0500
@@ -8,7 +8,7 @@
 $(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 freetds freetype fontconfig icu4c jpeg libjbig libpng libproxy pcre postgresql sqlite zlib
+$(PKG)_DEPS     := dbus double-conversion freetds freetype fontconfig icu4c jpeg libjbig libpng libproxy pcre postgresql sqlite zlib
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
@@ -79,8 +79,6 @@
 endif
 
 define $(PKG)_BUILD
-    # Use -qt-doubleconversion until we build our own version.
-    # Disable libproxy until we can build our own package.
     cd '$(1)' && \
         $($(PKG)_CONFIGURE_ENV) \
         ./configure \
@@ -112,7 +110,7 @@
             -fontconfig \
             -system-freetype \
             -system-pcre \
-            -qt-doubleconversion \
+            -system-doubleconversion \
             -no-openssl \
             -dbus-linked \
             -libproxy \