From aa7afe324c2092fb31f9498cb3eda47dda96e6f2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 26 Mar 2019 11:21:09 +0000 Subject: meson: strip rpath from megadrivers More specifically, use the library file that has been post-processed by Meson when creating the hardlinks. Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=108766 Fixes: 3218056e0eb375eeda47 "meson: Build i965 and dri stack" Signed-off-by: Eric Engestrom Reviewed-by: Dylan Baker --- src/gallium/targets/dri/meson.build | 3 +++ src/gallium/targets/va/meson.build | 1 + src/gallium/targets/vdpau/meson.build | 3 +++ src/gallium/targets/xvmc/meson.build | 3 +++ 4 files changed, 10 insertions(+) (limited to 'src/gallium/targets') diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 045b8111592..b3d3cd09c5b 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -60,6 +60,9 @@ libgallium_dri = shared_library( driver_tegra, driver_i915, driver_svga, driver_virgl, driver_swr, driver_panfrost, driver_iris ], + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : dri_drivers_path, ) foreach d : [[with_gallium_kmsro, [ diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 8786c80b810..827cfb8d829 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -49,6 +49,7 @@ libva_gallium = shared_library( dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau, ], link_depends : va_link_depends, + # Will be deleted during installation, see install_megadrivers.py install : true, install_dir : va_drivers_path, ) diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index b53a4c232e9..3017721bda0 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -55,6 +55,9 @@ libvdpau_gallium = shared_library( ], link_depends : vdpau_link_depends, soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR), + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : vdpau_drivers_path, ) foreach d : [[with_gallium_r300, 'r300'], [with_gallium_r600, 'r600'], diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build index f91ac4e8c0c..845f3a421b7 100644 --- a/src/gallium/targets/xvmc/meson.build +++ b/src/gallium/targets/xvmc/meson.build @@ -47,6 +47,9 @@ libxvmc_gallium = shared_library( ], dependencies : [dep_thread, driver_r600, driver_nouveau], link_depends : xvmc_link_depends, + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : xvmc_drivers_path, ) foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']] -- cgit v1.2.3