Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
4525:0deb76a57fae 4526:c283aa086767
6 $(PKG)_VERSION := 5.7.1 6 $(PKG)_VERSION := 5.7.1
7 $(PKG)_CHECKSUM := a3ddcde8978d3a05bb4342fce364a792472a16e6 7 $(PKG)_CHECKSUM := a3ddcde8978d3a05bb4342fce364a792472a16e6
8 $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
9 $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz 9 $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
10 $(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) 10 $(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
11 $(PKG)_DEPS := dbus freetds freetype fontconfig icu4c jpeg libjbig libpng libproxy pcre postgresql sqlite zlib 11 $(PKG)_DEPS := dbus double-conversion freetds freetype fontconfig icu4c jpeg libjbig libpng libproxy pcre postgresql sqlite zlib
12 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 12 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
13 $(PKG)_FONTCONFIG := fontconfig 13 $(PKG)_FONTCONFIG := fontconfig
14 endif 14 endif
15 ifeq ($(USE_SYSTEM_OPENGL),no) 15 ifeq ($(USE_SYSTEM_OPENGL),no)
16 $(PKG)_DEPS += mesa 16 $(PKG)_DEPS += mesa
77 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++ 77 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++
78 endif 78 endif
79 endif 79 endif
80 80
81 define $(PKG)_BUILD 81 define $(PKG)_BUILD
82 # Use -qt-doubleconversion until we build our own version.
83 # Disable libproxy until we can build our own package.
84 cd '$(1)' && \ 82 cd '$(1)' && \
85 $($(PKG)_CONFIGURE_ENV) \ 83 $($(PKG)_CONFIGURE_ENV) \
86 ./configure \ 84 ./configure \
87 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ 85 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
88 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ 86 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \
110 -system-libjpeg \ 108 -system-libjpeg \
111 -system-sqlite \ 109 -system-sqlite \
112 -fontconfig \ 110 -fontconfig \
113 -system-freetype \ 111 -system-freetype \
114 -system-pcre \ 112 -system-pcre \
115 -qt-doubleconversion \ 113 -system-doubleconversion \
116 -no-openssl \ 114 -no-openssl \
117 -dbus-linked \ 115 -dbus-linked \
118 -libproxy \ 116 -libproxy \
119 -no-pch \ 117 -no-pch \
120 -v \ 118 -v \