diff options
author | Eric Engestrom <eric.engestrom@intel.com> | 2019-03-26 11:21:09 +0000 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2019-04-05 11:31:05 +0100 |
commit | 14c82872f5b1d081c5c7e397445a88ebc96bf3df (patch) | |
tree | b55016895d060596d379e32df1d0378b6d527f62 | |
parent | 9434f6b5daccb3a45ee4b9e00c9fac9b114cc8f7 (diff) |
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 <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit aa7afe324c2092fb31f9498cb3eda47dda96e6f2)
-rw-r--r-- | bin/install_megadrivers.py | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri/meson.build | 3 | ||||
-rw-r--r-- | src/gallium/targets/va/meson.build | 1 | ||||
-rw-r--r-- | src/gallium/targets/vdpau/meson.build | 3 | ||||
-rw-r--r-- | src/gallium/targets/xvmc/meson.build | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/meson.build | 3 |
6 files changed, 13 insertions, 1 deletions
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py index ca543e5ce30..c9ab99a2833 100644 --- a/bin/install_megadrivers.py +++ b/bin/install_megadrivers.py @@ -49,7 +49,6 @@ def main(): if os.path.lexists(to): os.unlink(to) os.makedirs(to) - shutil.copy(args.megadriver, master) for driver in args.drivers: abs_driver = os.path.join(to, driver) diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 51940a2f350..4079ec387a4 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -60,6 +60,9 @@ libgallium_dri = shared_library( driver_imx, driver_tegra, driver_i915, driver_svga, driver_virgl, driver_swr, ], + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : dri_drivers_path, ) foreach d : [[with_gallium_pl111, 'pl111_dri.so'], 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']] diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 0410a5a12ec..a0f47bbecee 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -54,6 +54,9 @@ if dri_drivers != [] dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread, dep_dl, idep_nir, ], link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections], + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : dri_drivers_path, ) meson.add_install_script( |