1*4882a593SmuzhiyunFrom 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Romain Naour <romain.naour@smile.fr> 3*4882a593SmuzhiyunDate: Wed, 17 Apr 2019 23:07:42 +0200 4*4882a593SmuzhiyunSubject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunLIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation 7*4882a593Smuzhiyunwill look for OpenCL "headers" on the target, when building the OpenCL 8*4882a593Smuzhiyunkernels. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunThe value returned by pkg-config for includedir is relevant when 11*4882a593Smuzhiyuncross-compiling, on the build machine. But in this specific case, we 12*4882a593Smuzhiyunreally need a value that is valid on the target. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunThose headers are installed by the libclc package in /usr/share so 15*4882a593Smuzhiyunthat they are not removed by Buildroot target-finalize logic. 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunBased on the patch for autotools provided by Valentin Korenblit. 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@smile.fr> 20*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 21*4882a593Smuzhiyun[rebased for 20.2.0 & 20.3.0] 22*4882a593Smuzhiyun--- 23*4882a593Smuzhiyun src/gallium/frontends/clover/meson.build | 2 +- 24*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyundiff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build 27*4882a593Smuzhiyunindex 62ac5f5278d..ecdeb39669c 100644 28*4882a593Smuzhiyun--- a/src/gallium/frontends/clover/meson.build 29*4882a593Smuzhiyun+++ b/src/gallium/frontends/clover/meson.build 30*4882a593Smuzhiyun@@ -27,7 +27,7 @@ 31*4882a593Smuzhiyun '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', 32*4882a593Smuzhiyun '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', 33*4882a593Smuzhiyun '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', 34*4882a593Smuzhiyun- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')), 35*4882a593Smuzhiyun+ '-DLIBCLC_INCLUDEDIR="/usr/share"', 36*4882a593Smuzhiyun '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) 37*4882a593Smuzhiyun ] 38*4882a593Smuzhiyun clover_spirv_cpp_args = [] 39*4882a593Smuzhiyun-- 40*4882a593Smuzhiyun2.20.1 41*4882a593Smuzhiyun 42