Mercurial > mxe-octave

changeset 4992:5e93880ab76e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mesa.mk: Attempt to include system pkg-config path when needed.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 02 Mar 2019 17:47:21 +0100
parents 3768d38e7967
children 7e89d17a530c
files src/mesa.mk
diffstat 1 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/mesa.mk	Sun Feb 10 18:02:08 2019 +0100
+++ b/src/mesa.mk	Sat Mar 02 17:47:21 2019 +0100
@@ -8,6 +8,8 @@
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
 $(PKG)_DEPS     := build-mako expat zlib llvm s2tc
+
+$(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   ifeq ($(USE_SYSTEM_OPENGL),no)
     $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi
@@ -21,13 +23,17 @@
       --with-platforms=""
   else
     $(PKG)_CONFIGURE_OPENGL_OPTIONS := \
-      --enable-opengl --enable-egl --enable-gles1 --enable-gles2 \
-      --with-gallium-drivers="swrast" --with-dri-drivers="" \
-      --with-platforms="x11"
+      --enable-glx="gallium-xlib" --with-gallium-drivers="swrast" \
+      --disable-dri --disable-gbm --disable-egl
     ifeq ($(USE_SYSTEM_X11_LIBS),no)
       $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes
+    else
+      $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH)
     endif
   endif
+  $(PKG)_CONFIGURE_ENV += \
+      PKG_CONFIG="$(MXE_PKG_CONFIG)" \
+      PKG_CONFIG_LIBDIR=$($(PKG)_PKG_CONFIG_PATH)
 endif
 
 define $(PKG)_UPDATE