Module: Mesa
Branch: staging/22.3
Commit: e2811aed2fafa66c3229c058f55256aa34982b29
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2811aed2fafa66c3229c058f55256aa34982b29

Author: Yonggang Luo <[email protected]>
Date:   Wed Nov  9 10:30:57 2022 +0800

clover: Rename *OpenCL.def to *OpenCL.def.in

Cc: mesa-stable

Signed-off-by: Yonggang Luo <[email protected]>
Reviewed-by: Jesse Natalie <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19610>
(cherry picked from commit a3b26e2758d7fce890717e2679bd0e25ca1330d2)

---

 .pick_status.json                                                | 2 +-
 src/gallium/targets/opencl/{MesaOpenCL.def => MesaOpenCL.def.in} | 0
 src/gallium/targets/opencl/{OpenCL.def => OpenCL.def.in}         | 0
 src/gallium/targets/opencl/meson.build                           | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4a0be70ddef..426530c9b82 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
         "description": "clover: Rename *OpenCL.def to *OpenCL.def.in",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/targets/opencl/MesaOpenCL.def 
b/src/gallium/targets/opencl/MesaOpenCL.def.in
similarity index 100%
rename from src/gallium/targets/opencl/MesaOpenCL.def
rename to src/gallium/targets/opencl/MesaOpenCL.def.in
diff --git a/src/gallium/targets/opencl/OpenCL.def 
b/src/gallium/targets/opencl/OpenCL.def.in
similarity index 100%
rename from src/gallium/targets/opencl/OpenCL.def
rename to src/gallium/targets/opencl/OpenCL.def.in
diff --git a/src/gallium/targets/opencl/meson.build 
b/src/gallium/targets/opencl/meson.build
index 8f9d7ac5a53..b6cbbf2f2b5 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -85,7 +85,7 @@ if not _shared_llvm or not (dep_clang.found() and 
dep_clang_usable)
   endif
 endif
 
-ocldef = files(opencl_libname + '.def')[0]
+ocldef = files(opencl_libname + '.def.in')[0]
 
 libopencl = shared_library(
   opencl_libname,

Reply via email to