0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001
  2. From: Romain Naour <romain.naour@smile.fr>
  3. Date: Wed, 17 Apr 2019 23:07:42 +0200
  4. Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR
  5. LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation
  6. will look for OpenCL "headers" on the target, when building the OpenCL
  7. kernels.
  8. The value returned by pkg-config for includedir is relevant when
  9. cross-compiling, on the build machine. But in this specific case, we
  10. really need a value that is valid on the target.
  11. Those headers are installed by the libclc package in /usr/share so
  12. that they are not removed by Buildroot target-finalize logic.
  13. Based on the patch for autotools provided by Valentin Korenblit.
  14. Signed-off-by: Romain Naour <romain.naour@smile.fr>
  15. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  16. [rebased for 20.02.0]
  17. ---
  18. src/gallium/frontends/clover/meson.build | 2 +-
  19. 1 file changed, 1 insertion(+), 1 deletion(-)
  20. diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
  21. index 62ac5f5278d..ecdeb39669c 100644
  22. --- a/src/gallium/frontends/clover/meson.build
  23. +++ b/src/gallium/frontends/clover/meson.build
  24. @@ -63,7 +63,7 @@
  25. clover_cpp_args,
  26. clover_opencl_cpp_args,
  27. clover_spirv_cpp_args,
  28. - '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')),
  29. + '-DLIBCLC_INCLUDEDIR="/usr/share"',
  30. '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')),
  31. '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(
  32. dep_llvm.get_configtool_variable('libdir'), 'clang',
  33. --
  34. 2.20.1