dev-util/intel-graphics-compiler: fix opencl-clang filename mismatch

Upstream CMake files assumed that the shared-library file of opencl-clang
is named libopencl-clang.so.x if LLVM version is x.0.0 but
libopencl-clang.so.x.y.z otherwise. This is not correct, as
demonstrated by opencl-clang-8.0.1 - the shared library is still called
libopencl-clang.so.8. Make CMake always look for .so.x instead.

Closes: https://bugs.gentoo.org/690520
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Marek Szuba <marecki@gentoo.org>

diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
new file mode 100644 (file)
index 0000000..aef204e
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
@@ -0,0 +1,14 @@
+--- a/IGC/BiFModule/CMakeLists.txt
++++ b/IGC/BiFModule/CMakeLists.txt
+@@ -158,11 +158,7 @@
+ 
+ if(UNIX)
+   if(NOT ${CCLANG_BUILD_INTREE_LLVM})
+-    if(${LLVM_VERSION_MINOR} EQUAL 0 AND ${LLVM_VERSION_PATCH} EQUAL 0)
+       set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}")
+-    else()
+-      set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
+-    endif()
+   endif()
+   if (NOT CCLANG_FROM_SYSTEM)
+     install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)

diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
index 54d2ad4034cdef99e387000846b7fa2791536ada..6ed0f9a62901b0438556e061a64c4bd9501acc5e 100644 (file)
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
@@ -22,6 +22,7 @@ LLVM_MAX_SLOT=8
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+       "${FILESDIR}"/${PN}-1.0.9-opencl-clang_solib_filename.patch
 )
 
 S="${WORKDIR}"/${PN}-igc-${PV}