[Mesa-dev] [Bug 109752] meson: more ensure that xmlpool_options.h is generated for targets that need it

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=109752

            Bug ID: 109752
           Summary: meson: more ensure that xmlpool_options.h is generated
                    for  targets that need it
           Product: Mesa
           Version: unspecified
          Hardware: Other
                OS: NetBSD
            Status: NEW
          Severity: normal
          Priority: medium
         Component: Other
          Assignee: mesa-dev at lists.freedesktop.org
          Reporter: davshao at gmail.com
        QA Contact: mesa-dev at lists.freedesktop.org

Created attachment 143443
  --> https://bugs.freedesktop.org/attachment.cgi?id=143443&action=edit
xmlpool_options.h patches

Extension of
2018-02-06 meson: ensure xmlpool/options.h is generated for libgallium
commit  9440599c8e030bddd7e04620bed22df5a8a097fd

Lack of these patches caused a meson build to fail on NetBSD NetBSD 8.99.34
(GENERIC) pkgsrc for
2019-02-02      wsi/display: add comment
commit 808bf59cac793bc6c7de04eee4e23e6921a8a7b5

Subject: [PATCH] meson: more ensure that xmlpool_options.h is generated for
 targets that need it

Extension of
2018-02-06 meson: ensure xmlpool/options.h is generated for libgallium
commit  9440599c8e030bddd7e04620bed22df5a8a097fd
---
 src/gallium/targets/omx/meson.build   | 2 +-
 src/gallium/targets/va/meson.build    | 2 +-
 src/gallium/targets/vdpau/meson.build | 2 +-
 src/gallium/targets/xa/meson.build    | 2 +-
 src/gallium/targets/xvmc/meson.build  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/targets/omx/meson.build
b/src/gallium/targets/omx/meson.build
index 6811e6ff904..09925cb3c21 100644
--- a/src/gallium/targets/omx/meson.build
+++ b/src/gallium/targets/omx/meson.build
@@ -32,7 +32,7 @@ endif

 libomx_gallium = shared_library(
   'omx_mesa',
-  'target.c',
+  [files('target.c'), xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [omx_link_args, ld_args_gc_sections],
diff --git a/src/gallium/targets/va/meson.build
b/src/gallium/targets/va/meson.build
index ded689b464d..49e222cefb1 100644
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -33,7 +33,7 @@ endif

 libva_gallium = shared_library(
   'gallium_drv_video',
-  'target.c',
+  [files('target.c'), xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [va_link_args, ld_args_gc_sections],
diff --git a/src/gallium/targets/vdpau/meson.build
b/src/gallium/targets/vdpau/meson.build
index 22e3f5ffdd8..4398d67cdf7 100644
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@@ -38,7 +38,7 @@ endif

 libvdpau_gallium = shared_library(
   'vdpau_gallium',
-  'target.c',
+  [files('target.c'), xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [vdpau_link_args, ld_args_gc_sections],
diff --git a/src/gallium/targets/xa/meson.build
b/src/gallium/targets/xa/meson.build
index 733ef54ff85..7bbefa63940 100644
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -34,7 +34,7 @@ _xa_version = '.'.join(xa_version)

 libxatracker = shared_library(
   'xatracker',
-  'target.c',
+  [files('target.c'), xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [xa_link_args, ld_args_gc_sections],
diff --git a/src/gallium/targets/xvmc/meson.build
b/src/gallium/targets/xvmc/meson.build
index 0af5b6477ce..e1d748cde66 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -33,7 +33,7 @@ endif

 libxvmc_gallium = shared_library(
   'XvMCgallium',
-  'target.c',
+  [files('target.c'), xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [xvmc_link_args, ld_args_gc_sections],
-- 
2.20.1

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are the QA Contact for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20190223/197eb60e/attachment.html>