From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAC36138334 for ; Mon, 5 Aug 2019 15:26:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03E7BE07F2; Mon, 5 Aug 2019 15:26:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C97B4E07F2 for ; Mon, 5 Aug 2019 15:26:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40FF13494F9 for ; Mon, 5 Aug 2019 15:26:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7BCF74E for ; Mon, 5 Aug 2019 15:26:48 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1565018793.0f58ae2424ed029568d83593821e22a66f10ae47.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild X-VCS-Directories: dev-util/intel-graphics-compiler/ dev-util/intel-graphics-compiler/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 0f58ae2424ed029568d83593821e22a66f10ae47 X-VCS-Branch: master Date: Mon, 5 Aug 2019 15:26:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d03ef91-a478-429e-8a1a-19979c47f7a7 X-Archives-Hash: 4e45853196c39afbe2465d1476b82c29 commit: 0f58ae2424ed029568d83593821e22a66f10ae47 Author: Marek Szuba gentoo org> AuthorDate: Mon Aug 5 15:19:15 2019 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Aug 5 15:26:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f58ae24 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 gentoo.org> ...aphics-compiler-1.0.9-opencl-clang_solib_filename.patch | 14 ++++++++++++++ .../intel-graphics-compiler-1.0.9.ebuild | 1 + 2 files changed, 15 insertions(+) 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 index 00000000000..aef204e9055 --- /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 $ 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 54d2ad4034c..6ed0f9a6290 100644 --- 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}