Mercurial > mxe-octave

diff 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
line wrap: on
line diff
--- a/src/qtbase.mk	Mon Feb 25 09:33:23 2019 -0500
+++ b/src/qtbase.mk	Sun Feb 24 09:18:42 2019 -0500
@@ -20,6 +20,7 @@
 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
 $(PKG)_CONFIGURE_OPTS :=
+$(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 
 ifeq ($(USE_SYSTEM_OPENGL),no)
   $(PKG)_DEPS += mesa
@@ -80,6 +81,7 @@
   ifeq ($(MXE_WINDOWS_BUILD),yes)
     $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
   endif
+  $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH)
 else
   $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
     -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
@@ -91,7 +93,7 @@
 $(PKG)_CONFIGURE_ENV += \
     PKG_CONFIG="$(MXE_PKG_CONFIG)" \
     PKG_CONFIG_SYSROOT_DIR="/" \
-    PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)"
+    PKG_CONFIG_LIBDIR=$($(PKG)_PKG_CONFIG_PATH)
 
 define $(PKG)_BUILD
     cd '$(1)' && \