[arch-commits] Commit in intel-graphics-compiler/repos/community-x86_64 (3 files)
Daniel Bermond
dbermond at archlinux.org
Tue Jun 4 22:12:30 UTC 2019
Date: Tuesday, June 4, 2019 @ 22:12:29
Author: dbermond
Revision: 476917
archrelease: copy trunk to community-x86_64
Added:
intel-graphics-compiler/repos/community-x86_64/PKGBUILD
(from rev 476916, intel-graphics-compiler/trunk/PKGBUILD)
intel-graphics-compiler/repos/community-x86_64/igc-fix-build-with-system-opencl-clang.patch
(from rev 476916, intel-graphics-compiler/trunk/igc-fix-build-with-system-opencl-clang.patch)
Deleted:
intel-graphics-compiler/repos/community-x86_64/PKGBUILD
----------------------------------------------+
PKGBUILD | 96 +++++++++++++------------
igc-fix-build-with-system-opencl-clang.patch | 69 +++++++++++++++++
2 files changed, 120 insertions(+), 45 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-04 22:12:00 UTC (rev 476916)
+++ PKGBUILD 2019-06-04 22:12:29 UTC (rev 476917)
@@ -1,45 +0,0 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=intel-graphics-compiler
-epoch=1
-pkgver=1.0.6
-pkgrel=1
-pkgdesc="Intel Graphics Compiler for OpenCL"
-arch=(x86_64)
-url="https://github.com/intel/intel-graphics-compiler"
-license=(MIT)
-depends=(llvm-libs intel-opencl-clang)
-makedepends=(cmake clang llvm zlib python2)
-options=('!emptydirs')
-source=("${url}/archive/igc-${pkgver}.tar.gz")
-noextract=("igc-${pkgver}.tar.gz")
-sha256sums=('f73bee8286aa56c2a7b2c7a7bc9068440a8a77fecfac571b95f2119f162185ef')
-
-prepare() {
- mkdir -p build ${pkgname}-${pkgver}
- bsdtar xf igc-${pkgver}.tar.gz -C ${pkgname}-${pkgver} --strip-components='1'
-}
-
-build() {
- cd build
- cmake ../"${pkgname}-${pkgver}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DIGC_OPTION__ARCHITECTURE_TARGET='Linux64' \
- -DIGC_OPTION__OUTPUT_DIR='../igc-install/Release' \
- -DIGC_PREFERRED_LLVM_VERSION='8.0.0' \
- -Wno-dev
- make
-
- # License
- sed -n '2,20p' IGC/AdaptorOCL/igc.opencl.h > LICENSE # create file
- sed -i '1,22s/^.\{,3\}//' LICENSE # erase C comments
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
- install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}
Copied: intel-graphics-compiler/repos/community-x86_64/PKGBUILD (from rev 476916, intel-graphics-compiler/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-04 22:12:29 UTC (rev 476917)
@@ -0,0 +1,51 @@
+# Maintainer: Daniel Bermond <dbermond at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=intel-graphics-compiler
+epoch=1
+pkgver=1.0.7
+pkgrel=1
+pkgdesc="Intel Graphics Compiler for OpenCL"
+arch=(x86_64)
+url="https://github.com/intel/intel-graphics-compiler"
+license=(MIT)
+depends=(llvm-libs intel-opencl-clang)
+makedepends=(cmake clang llvm zlib python2)
+options=('!emptydirs')
+source=("${url}/archive/igc-${pkgver}.tar.gz"
+ 'igc-fix-build-with-system-opencl-clang.patch')
+noextract=("igc-${pkgver}.tar.gz")
+sha256sums=('b95afb8f983f38a8aedfa9d77ecb619706f58baae31dd7da0c4e31962b9205c1'
+ 'e4221ca82774d8afda7b581d5b80cffa6c47d8326aaee068546d8e63f5bef63d')
+
+prepare() {
+ mkdir -p build ${pkgname}-${pkgver}
+ bsdtar xf igc-${pkgver}.tar.gz -C ${pkgname}-${pkgver} --strip-components='1'
+
+ # fix build with system opencl-clang
+ # https://github.com/intel/intel-graphics-compiler/issues/95
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/igc-fix-build-with-system-opencl-clang.patch"
+}
+
+build() {
+ cd build
+ cmake ../"${pkgname}-${pkgver}" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DIGC_OPTION__ARCHITECTURE_TARGET='Linux64' \
+ -DIGC_PREFERRED_LLVM_VERSION='8.0.0' \
+ -Wno-dev
+ make
+
+ # License
+ sed -n '2,20p' IGC/AdaptorOCL/igc.opencl.h > LICENSE # create file
+ sed -i '1,22s/^.\{,3\}//' LICENSE # erase C comments
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}
Copied: intel-graphics-compiler/repos/community-x86_64/igc-fix-build-with-system-opencl-clang.patch (from rev 476916, intel-graphics-compiler/trunk/igc-fix-build-with-system-opencl-clang.patch)
===================================================================
--- igc-fix-build-with-system-opencl-clang.patch (rev 0)
+++ igc-fix-build-with-system-opencl-clang.patch 2019-06-04 22:12:29 UTC (rev 476917)
@@ -0,0 +1,69 @@
+intel-graphics-compiler 1.0.7
+Fix build with system opencl-clang
+https://github.com/intel/intel-graphics-compiler/issues/95
+
+Backport of:
+https://github.com/intel/intel-graphics-compiler/commit/5d2ab178abeee5a71ba6409a1e7208d4f1f0041a
+
+diff -Naurp a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt
+--- a/IGC/BiFModule/CMakeLists.txt 2019-06-03 17:27:09.604195718 +0000
++++ b/IGC/BiFModule/CMakeLists.txt 2019-06-04 01:11:06.739758208 +0000
+@@ -60,7 +60,7 @@ endif()
+ ###
+
+ ### Check by order first available way to link with opencl-clang
+-if(${CCLANG_FROM_SYSTEM})
++if(CCLANG_FROM_SYSTEM)
+ message(STATUS "[IGC\\BiFModule] : opencl-clang will be taken from system")
+ else()
+ if(NOT DEFINED CCLANG_BUILD_PREBUILDS_DIR)
+@@ -103,7 +103,7 @@ endif()
+ ###
+
+ #1. CCLANG_FROM_SYSTEM - use installed on system opencl-clang toolchain
+-if(${CCLANG_FROM_SYSTEM})
++if(CCLANG_FROM_SYSTEM)
+ find_library(SYSTEM_COMMON_CLANG ${COMMON_CLANG_LIBRARY_NAME})
+
+ add_library(opencl-clang-lib SHARED IMPORTED GLOBAL)
+@@ -127,12 +127,6 @@ elseif(${CCLANG_BUILD_PREBUILDS})
+ add_library(opencl-clang-lib SHARED IMPORTED GLOBAL)
+ set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_LOCATION" "${CCLANG_BUILD_PREBUILDS_DIR}/${COMMON_CLANG_LIB_FULL_NAME}")
+
+- 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()
+-
+ add_executable(clang-tool IMPORTED GLOBAL)
+ set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CCLANG_BUILD_PREBUILDS_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}")
+
+@@ -146,13 +140,20 @@ elseif(${CCLANG_BUILD_INTREE_LLVM})
+ endif()
+ ###
+
+-if(UNIX AND NOT ${CCLANG_FROM_SYSTEM})
+- install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
+- install(FILES $<TARGET_SONAME_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
+-
+- install(FILES $<TARGET_FILE:clang-tool> DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-opencl-devel)
+- install(FILES $<TARGET_FILE:clang-tool>-${LLVM_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-opencl-devel)
+- install(FILES ${opencl-header} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} COMPONENT igc-opencl-devel)
++if(UNIX)
++ 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()
++ if (NOT CCLANG_FROM_SYSTEM)
++ install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
++ install(FILES $<TARGET_SONAME_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
++
++ install(FILES $<TARGET_FILE:clang-tool> DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-opencl-devel)
++ install(FILES $<TARGET_FILE:clang-tool>-${LLVM_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-opencl-devel)
++ install(FILES ${opencl-header} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} COMPONENT igc-opencl-devel)
++ endif()
+ endif()
+
+ #NEO needs to change the target name
More information about the arch-commits
mailing list