Mercurial > mxe-octave
changeset 4525:0deb76a57fae
Use libproxy, icu4c and libjbig in build
* src/qtbase.mk: enable libproxy and icu4c, add as dependancies
* src/tiff.mk: enable libjbig, add as dependancy
author | John D |
---|---|
date | Wed, 08 Nov 2017 08:20:51 -0500 |
parents | 413af27223f6 |
children | c283aa086767 |
files | src/qtbase.mk src/tiff.mk |
diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase.mk Tue Nov 07 16:43:05 2017 -0500 +++ b/src/qtbase.mk Wed Nov 08 08:20:51 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 jpeg libpng pcre postgresql sqlite zlib +$(PKG)_DEPS := dbus freetds freetype fontconfig icu4c jpeg libjbig libpng libproxy pcre postgresql sqlite zlib ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif @@ -79,7 +79,6 @@ endif define $(PKG)_BUILD - # ICU is buggy. See #653. TODO: reenable it some time in the future. # Use -qt-doubleconversion until we build our own version. # Disable libproxy until we can build our own package. cd '$(1)' && \ @@ -99,7 +98,7 @@ -shared \ $($(PKG)_CONFIGURE_PREFIX_OPTION) \ -hostprefix '$(BUILD_TOOLS_PREFIX)' \ - -no-icu \ + -icu \ -opengl desktop \ -no-glib \ -accessibility \ @@ -116,7 +115,7 @@ -qt-doubleconversion \ -no-openssl \ -dbus-linked \ - -no-libproxy \ + -libproxy \ -no-pch \ -v \ $($(PKG)_CONFIGURE_OPTS)
--- a/src/tiff.mk Tue Nov 07 16:43:05 2017 -0500 +++ b/src/tiff.mk Wed Nov 08 08:20:51 2017 -0500 @@ -9,7 +9,7 @@ $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/libtiff/$($(PKG)_FILE) -$(PKG)_DEPS := zlib jpeg +$(PKG)_DEPS := zlib libjbig jpeg ifneq ($(MXE_SYSTEM),msvc) $(PKG)_DEPS += xz endif @@ -26,7 +26,7 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - --disable-jbig --without-x && $(CONFIGURE_POST_HOOK) + --enable-jbig --without-x && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)' $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'