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

123456789101112131415161718192021222324252627282930313233343536373839
  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. ---
  16. src/gallium/state_trackers/clover/meson.build | 2 +-
  17. 1 file changed, 1 insertion(+), 1 deletion(-)
  18. diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build
  19. index 62ac5f5278d..ecdeb39669c 100644
  20. --- a/src/gallium/state_trackers/clover/meson.build
  21. +++ b/src/gallium/state_trackers/clover/meson.build
  22. @@ -49,7 +49,7 @@ libclllvm = static_library(
  23. include_directories : clover_incs,
  24. cpp_args : [
  25. cpp_vis_args,
  26. - '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')),
  27. + '-DLIBCLC_INCLUDEDIR="/usr/share"',
  28. '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')),
  29. '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(
  30. dep_llvm.get_configtool_variable('libdir'), 'clang',
  31. --
  32. 2.20.1