Mercurial > mxe-octave

comparison src/qtbase.mk @ 4967:46f4053aa6a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Attempt to include system pkg config path when when needed * src/qtbase.mk: in native mode, include system pkg config path * Makefile.in: set build pkg config path
author John Donoghue <john.donoghue@ieee.org>
date Sun, 24 Feb 2019 09:18:42 -0500
parents 8b4d4e06075d
children 59ea6e6b36e3
comparison
equal deleted inserted replaced
4966:1e7b589c1b85 4967:46f4053aa6a3
18 $(PKG)_CONFIGURE_ENV := 18 $(PKG)_CONFIGURE_ENV :=
19 $(PKG)_CONFIGURE_INCLUDE_OPTION := 19 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
20 $(PKG)_CONFIGURE_LIBPATH_OPTION := 20 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
21 $(PKG)_CONFIGURE_PLATFORM_OPTION := 21 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
22 $(PKG)_CONFIGURE_OPTS := 22 $(PKG)_CONFIGURE_OPTS :=
23 $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
23 24
24 ifeq ($(USE_SYSTEM_OPENGL),no) 25 ifeq ($(USE_SYSTEM_OPENGL),no)
25 $(PKG)_DEPS += mesa 26 $(PKG)_DEPS += mesa
26 endif 27 endif
27 ifeq ($(MXE_WINDOWS_BUILD),yes) 28 ifeq ($(MXE_WINDOWS_BUILD),yes)
78 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0' 79 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0'
79 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include' 80 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include'
80 ifeq ($(MXE_WINDOWS_BUILD),yes) 81 ifeq ($(MXE_WINDOWS_BUILD),yes)
81 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++ 82 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
82 endif 83 endif
84 $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH)
83 else 85 else
84 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \ 86 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
85 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) 87 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
86 ifeq ($(MXE_WINDOWS_BUILD),yes) 88 ifeq ($(MXE_WINDOWS_BUILD),yes)
87 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++ 89 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++
89 endif 91 endif
90 92
91 $(PKG)_CONFIGURE_ENV += \ 93 $(PKG)_CONFIGURE_ENV += \
92 PKG_CONFIG="$(MXE_PKG_CONFIG)" \ 94 PKG_CONFIG="$(MXE_PKG_CONFIG)" \
93 PKG_CONFIG_SYSROOT_DIR="/" \ 95 PKG_CONFIG_SYSROOT_DIR="/" \
94 PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)" 96 PKG_CONFIG_LIBDIR=$($(PKG)_PKG_CONFIG_PATH)
95 97
96 define $(PKG)_BUILD 98 define $(PKG)_BUILD
97 cd '$(1)' && \ 99 cd '$(1)' && \
98 $($(PKG)_CONFIGURE_ENV) \ 100 $($(PKG)_CONFIGURE_ENV) \
99 ./configure \ 101 ./configure \