comparison src/qtbase.mk @ 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 c48b41efdcf4
children c283aa086767
comparison
equal deleted inserted replaced
4524:413af27223f6 4525:0deb76a57fae
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 jpeg libpng pcre postgresql sqlite zlib 11 $(PKG)_DEPS := dbus 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 # ICU is buggy. See #653. TODO: reenable it some time in the future.
83 # Use -qt-doubleconversion until we build our own version. 82 # Use -qt-doubleconversion until we build our own version.
84 # Disable libproxy until we can build our own package. 83 # Disable libproxy until we can build our own package.
85 cd '$(1)' && \ 84 cd '$(1)' && \
86 $($(PKG)_CONFIGURE_ENV) \ 85 $($(PKG)_CONFIGURE_ENV) \
87 ./configure \ 86 ./configure \
97 -force-pkg-config \ 96 -force-pkg-config \
98 -no-use-gold-linker \ 97 -no-use-gold-linker \
99 -shared \ 98 -shared \
100 $($(PKG)_CONFIGURE_PREFIX_OPTION) \ 99 $($(PKG)_CONFIGURE_PREFIX_OPTION) \
101 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ 100 -hostprefix '$(BUILD_TOOLS_PREFIX)' \
102 -no-icu \ 101 -icu \
103 -opengl desktop \ 102 -opengl desktop \
104 -no-glib \ 103 -no-glib \
105 -accessibility \ 104 -accessibility \
106 -nomake examples \ 105 -nomake examples \
107 -nomake tests \ 106 -nomake tests \
114 -system-freetype \ 113 -system-freetype \
115 -system-pcre \ 114 -system-pcre \
116 -qt-doubleconversion \ 115 -qt-doubleconversion \
117 -no-openssl \ 116 -no-openssl \
118 -dbus-linked \ 117 -dbus-linked \
119 -no-libproxy \ 118 -libproxy \
120 -no-pch \ 119 -no-pch \
121 -v \ 120 -v \
122 $($(PKG)_CONFIGURE_OPTS) 121 $($(PKG)_CONFIGURE_OPTS)
123 122
124 $(MAKE) -C '$(1)' -j '$(JOBS)' 123 $(MAKE) -C '$(1)' -j '$(JOBS)'