Mercurial > mxe-octave
changeset 4967:46f4053aa6a3
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 | 1e7b589c1b85 |
| children | 9ba1b42fdd65 |
| files | Makefile.in src/qtbase.mk |
| diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Feb 25 09:33:23 2019 -0500 +++ b/Makefile.in Sun Feb 24 09:18:42 2019 -0500 @@ -316,6 +316,19 @@ ENV_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH) +ifeq ($(BUILD_PKG_CONFIG_PATH),) + ifeq ($(PKG_CONFIG_PATH),) + BUILD_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH) + else + ifneq (,$(wildcard /usr/lib/$(subst -pc,,$(BUILD_SYSTEM)))) + BUILD_PKG_CONFIG_PATH := /usr/lib/$(subst -pc,,$(BUILD_SYSTEM))/pkgconfig + else + BUILD_PKG_CONFIG_PATH := /usr/lib/pkgconfig + endif + endif + export BUILD_PKG_CONFIG_PATH +endif + CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
--- 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)' && \