Mercurial > mxe-octave

comparison src/qtbase.mk @ 4803:e2349691d6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix fontconfig dependencies Only include fontconfig as a dependency if USE_SYSTEM_FONTCONFIG is no.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Aug 2018 14:09:31 -0400
parents 206f76f1b59c
children b44c4c322953
comparison
equal deleted inserted replaced
4802:9d58f6f5eaf3 4803:e2349691d6ae
6 $(PKG)_VERSION := 5.11.1 6 $(PKG)_VERSION := 5.11.1
7 $(PKG)_CHECKSUM := 7 $(PKG)_CHECKSUM :=
8 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION)
9 $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz 9 $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
10 $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) 10 $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
11 $(PKG)_DEPS := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib 11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
12 $(PKG)_FONTCONFIG := fontconfig
13 endif
14 $(PKG)_DEPS := dbus double-conversion freetds freetype $($(PKG)_FONTCONFIG) jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib
12 15
13 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := 16 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
14 $(PKG)_CONFIGURE_DATABASE_OPTION := 17 $(PKG)_CONFIGURE_DATABASE_OPTION :=
15 $(PKG)_CONFIGURE_ENV := 18 $(PKG)_CONFIGURE_ENV :=
16 $(PKG)_CONFIGURE_INCLUDE_OPTION := 19 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
17 $(PKG)_CONFIGURE_LIBPATH_OPTION := 20 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
18 $(PKG)_CONFIGURE_PLATFORM_OPTION := 21 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
19 $(PKG)_CONFIGURE_OPTS := 22 $(PKG)_CONFIGURE_OPTS :=
20 23
21 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
22 $(PKG)_FONTCONFIG := fontconfig
23 endif
24 ifeq ($(USE_SYSTEM_OPENGL),no) 24 ifeq ($(USE_SYSTEM_OPENGL),no)
25 $(PKG)_DEPS += mesa 25 $(PKG)_DEPS += mesa
26 endif 26 endif
27 ifeq ($(MXE_WINDOWS_BUILD),yes) 27 ifeq ($(MXE_WINDOWS_BUILD),yes)
28 ifeq ($(ENABLE_WINDOWS64),yes) 28 ifeq ($(ENABLE_WINDOWS64),yes)