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
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
