From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 8/8] rules/mesalib.make: Use CROSS_LIB_DIR.
Date: Wed, 8 Sep 2021 16:00:02 +0200 [thread overview]
Message-ID: <20210908140002.299517-8-christian.melki@t2data.com> (raw)
In-Reply-To: <20210908140002.299517-1-christian.melki@t2data.com>
Let mesalib install various libraries in CROSS_LIB_DIR.
---
rules/mesalib.make | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 945b7c523..a1f92224b 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -123,12 +123,12 @@ MESALIB_CONF_OPT := \
-Dbuild-aco-tests=false \
-Dbuild-tests=false \
-Dcustom-shader-replacement= \
- -Dd3d-drivers-path=/usr/lib/d3d \
+ -Dd3d-drivers-path=/usr/$(CROSS_LIB_DIR)/d3d \
-Ddatasources=auto \
-Ddraw-use-llvm=true \
-Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
- -Ddri-drivers-path=/usr/lib/dri \
- -Ddri-search-path=/usr/lib/dri \
+ -Ddri-drivers-path=/usr/$(CROSS_LIB_DIR)/dri \
+ -Ddri-search-path=/usr/$(CROSS_LIB_DIR)/dri \
-Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
-Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
-Degl-lib-suffix= \
@@ -161,7 +161,7 @@ MESALIB_CONF_OPT := \
-Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
-Dmicrosoft-clc=disabled \
-Dmoltenvk-dir= \
- -Domx-libs-path=/usr/lib/dri \
+ -Domx-libs-path=/usr/$(CROSS_LIB_DIR)/dri \
-Dopencl-native=false \
-Dopencl-spirv=false \
-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
@@ -185,14 +185,14 @@ MESALIB_CONF_OPT := \
-Dstatic-libclc=[] \
-Dswr-arches=[] \
-Dtools=[] \
- -Dva-libs-path=/usr/lib/dri \
+ -Dva-libs-path=/usr/$(CROSS_LIB_DIR)/dri \
-Dvalgrind=disabled \
- -Dvdpau-libs-path=/usr/lib/vdpau \
+ -Dvdpau-libs-path=/usr/$(CROSS_LIB_DIR)/vdpau \
-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
-Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
-Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
- -Dxvmc-libs-path=/usr/lib \
+ -Dxvmc-libs-path=/usr/$(CROSS_LIB_DIR) \
-Dzlib=enabled \
-Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d
@@ -221,22 +221,22 @@ $(STATEDIR)/mesalib.targetinstall:
@$(foreach lib, $(MESALIB_DRI_LIBS-y), \
$(call install_copy, mesalib, 0, 0, 0644, -, \
- /usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
+ /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl))
ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
@$(call install_copy, mesalib, 0, 0, 0644, \
- $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
- /usr/lib/dri/gallium_dri.so)
+ $(MESALIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
+ /usr/$(CROSS_LIB_DIR)/dri/gallium_dri.so)
@$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \
$(call install_link, mesalib, gallium_dri.so, \
- /usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
+ /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl))
endif
ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),)
@$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \
$(call install_copy, mesalib, 0, 0, 0644, -, \
- /usr/lib/libvulkan_$(lib).so)$(ptx/nl) \
+ /usr/$(CROSS_LIB_DIR)/libvulkan_$(lib).so)$(ptx/nl) \
$(call install_glob, mesalib, 0, 0, -, \
/etc/vulkan/icd.d, */$(lib)_icd.*.json)$(ptx/nl))
endif
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-09-08 14:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 13:59 [ptxdist] [PATCH 1/8] rules/xorg-driver-input-evdev.make: " Christian Melki
2021-09-08 13:59 ` [ptxdist] [PATCH 2/8] rules/xorg-driver-input-keyboard.make: " Christian Melki
2021-09-08 13:59 ` [ptxdist] [PATCH 3/8] rules/xorg-driver-input-mouse.make: " Christian Melki
2021-09-08 13:59 ` [ptxdist] [PATCH 4/8] rules/xorg-driver-input-tslib.make: " Christian Melki
2021-09-08 13:59 ` [ptxdist] [PATCH 5/8] rules/xorg-driver-input-void.make: " Christian Melki
2021-09-08 14:00 ` [ptxdist] [PATCH 6/8] rules/xorg-driver-video-vesa.make: " Christian Melki
2021-09-08 14:00 ` [ptxdist] [PATCH 7/8] rules/xorg-fonts.make: " Christian Melki
2021-09-08 14:00 ` Christian Melki [this message]
2021-09-29 9:05 ` [ptxdist] [PATCH 1/8] rules/xorg-driver-input-evdev.make: " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210908140002.299517-8-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox