diff options
| author | Dylan Baker <[email protected]> | 2017-12-01 14:01:40 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-12-04 10:14:09 -0800 |
| commit | 2be2565b9e8b86bd7c65d94287cd03ced6e93bcd (patch) | |
| tree | 9a5f2af9ee226d20553573ae92d31dc9a22ade56 | |
| parent | 2ead8f1690823bbb1acb8102bb6ceee26e8574b1 (diff) | |
meson: Install dri.pc file when building gallium dri drivers
Currently this pkg-config file is only installed if a classic dri driver
is built. This is wrong, it should be installed if any dri driver is
installed, which includes the gallium dri target.
Reported-by: Marc Dietrich <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/meson.build | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 217f1e5c71c..4ec2f343df2 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -53,6 +53,17 @@ if dri_drivers != [] link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections], ) + meson.add_install_script( + join_paths(meson.source_root(), 'bin/install_megadrivers.py'), + libmesa_dri_drivers.full_path(), + dri_drivers_path, + dri_link, + ) +endif + +# This needs to be installed if any dri drivers (including gallium dri drivers) +# are built. +if with_dri pkg.generate( name : 'dri', filebase : 'dri', @@ -61,11 +72,4 @@ if dri_drivers != [] variables : ['dridriverdir=${prefix}/' + dri_drivers_path], requires_private : ['libdrm >= 2.4.75'], # FIXME: don't hardcode this ) - - meson.add_install_script( - join_paths(meson.source_root(), 'bin/install_megadrivers.py'), - libmesa_dri_drivers.full_path(), - dri_drivers_path, - dri_link, - ) endif |