public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/
Date: Mon,  5 Aug 2019 15:26:48 +0000 (UTC)	[thread overview]
Message-ID: <1565018793.0f58ae2424ed029568d83593821e22a66f10ae47.marecki@gentoo> (raw)

commit:     0f58ae2424ed029568d83593821e22a66f10ae47
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 15:19:15 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> 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 <marecki <AT> 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 $<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 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}


             reply	other threads:[~2019-08-05 15:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-05 15:26 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-06-19 14:31 [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/ Marek Szuba
2020-09-13 22:45 Marek Szuba
2021-08-16 17:12 Conrad Kostecki
2021-08-28  1:57 Conrad Kostecki
2021-09-03 18:25 Conrad Kostecki
2021-09-21 18:26 Conrad Kostecki
2021-10-21 22:36 Conrad Kostecki
2022-04-23 18:33 Conrad Kostecki
2022-09-25 23:12 Conrad Kostecki
2022-12-30 23:39 Conrad Kostecki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565018793.0f58ae2424ed029568d83593821e22a66f10ae47.marecki@gentoo \
    --to=marecki@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox