# HG changeset patch # User John D # Date 1510147254 18000 # Node ID c283aa086767c3d5cfd4e406a52ead13f6d2a5c0 # Parent 0deb76a57faee46f8e2a88b6900c7821e8f80369 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 diff -r 0deb76a57fae -r c283aa086767 index.html --- a/index.html Wed Nov 08 08:20:51 2017 -0500 +++ b/index.html Wed Nov 08 08:20:54 2017 -0500 @@ -1138,6 +1138,10 @@ DevIL + double-conversion + double-conversion + + dri2proto dri2proto diff -r 0deb76a57fae -r c283aa086767 src/double-conversion.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/double-conversion.mk Wed Nov 08 08:20:54 2017 -0500 @@ -0,0 +1,29 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := double-conversion +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.0.0 +$(PKG)_CHECKSUM := d900d4d946beb493a03cd6c9b180ed2bcbd0f20e +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := + +$(PKG)_CMAKE_FLAGS := + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_TESTING=no \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install +endef diff -r 0deb76a57fae -r c283aa086767 src/qtbase.mk --- 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 \