From 91015aa0646267f2168cf1768b551c7923141d3b Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 12 May 2020 01:35:04 +0200 Subject: [PATCH 1/7] WIP --- common/shlibs | 2 ++ srcpkgs/SPIRV-LLVM-Translator-devel | 1 + srcpkgs/SPIRV-LLVM-Translator/template | 36 +++++++++++++++++++ srcpkgs/intel-compute-runtime/template | 28 +++++++++++++++ .../patches/musl.patch | 13 +++++++ srcpkgs/intel-graphics-compiler/template | 26 ++++++++++++++ srcpkgs/intel-opencl-clang/template | 22 ++++++++++++ 7 files changed, 128 insertions(+) create mode 120000 srcpkgs/SPIRV-LLVM-Translator-devel create mode 100644 srcpkgs/SPIRV-LLVM-Translator/template create mode 100644 srcpkgs/intel-compute-runtime/template create mode 100644 srcpkgs/intel-graphics-compiler/patches/musl.patch create mode 100644 srcpkgs/intel-graphics-compiler/template create mode 100644 srcpkgs/intel-opencl-clang/template diff --git a/common/shlibs b/common/shlibs index d7ef5f18ee9..436261ca498 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3876,3 +3876,5 @@ libhidrd_opt.so.0 hidrd-0.2.0_1 libhidrd_strm.so.0 hidrd-0.2.0_1 libhidrd_fmt.so.0 hidrd-0.2.0_1 libjcat.so.1 libjcat-0.1.2_1 +libLLVMSPIRVLib.so.10 SPIRV-LLVM-Translator-10.0.0_1 +libopencl-clang.so.10 intel-opencl-clang-10.0.0.1_1 diff --git a/srcpkgs/SPIRV-LLVM-Translator-devel b/srcpkgs/SPIRV-LLVM-Translator-devel new file mode 120000 index 00000000000..170ae65aeda --- /dev/null +++ b/srcpkgs/SPIRV-LLVM-Translator-devel @@ -0,0 +1 @@ +SPIRV-LLVM-Translator \ No newline at end of file diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template new file mode 100644 index 00000000000..1be0ff4278c --- /dev/null +++ b/srcpkgs/SPIRV-LLVM-Translator/template @@ -0,0 +1,36 @@ +# Template file for 'SPIRV-LLVM-Translator' +pkgname=SPIRV-LLVM-Translator +version=10.0.0 +revision=1 +wrksrc=SPIRV-LLVM-Translator-${version} +#create_wrksrc=yes +#archs="i686 x86_64" +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +#hostmakedepends="llvm10" +makedepends="clang-tools-extra llvm10" +depends="" +short_desc="library and tool for translation between LLVM IR and SPIR-V" +maintainer="Stefano Ragni " +license="custom:LLVM" +homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v${version}.tar.gz" +checksum=7ccde52bac4c9ad967a362a3c5ec7261aa5b7b34d28cef0f3dec38d77c923049 + +post_install() { + vlicense LICENSE.TXT +} + +SPIRV-LLVM-Translator-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/intel-compute-runtime/template b/srcpkgs/intel-compute-runtime/template new file mode 100644 index 00000000000..6d31353efd6 --- /dev/null +++ b/srcpkgs/intel-compute-runtime/template @@ -0,0 +1,28 @@ +# Template file for 'intel-compute-runtime' +pkgname=intel-compute-runtime +version=20.18.16699 +revision=1 +wrksrc=compute-runtime-${version} +#create_wrksrc=yes +archs="i686* x86_64*" +build_style=cmake +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="pkg-config" +makedepends="intel-gmmlib-devel intel-graphics-compiler libexecinfo-devel" +depends="intel-gmmlib intel-graphics-compiler" +short_desc="Intel Graphics Compute Runtime for OpenCL (Broadwell+)" +maintainer="Stefano Ragni " +license="MIT" +homepage="https://github.com/intel/compute-runtime" +distfiles="https://github.com/intel/compute-runtime/archive/${version}.tar.gz" +checksum=04576130cbb72af19ef6c79092105af7c06df95d7b17769d8fd815fe81c42b12 + +CXXFLAGS+=" -lexecinfo" + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/intel-graphics-compiler/patches/musl.patch b/srcpkgs/intel-graphics-compiler/patches/musl.patch new file mode 100644 index 00000000000..f8f50294678 --- /dev/null +++ b/srcpkgs/intel-graphics-compiler/patches/musl.patch @@ -0,0 +1,13 @@ +diff --git inc/common/UFO/portable_compiler.h inc/common/UFO/portable_compiler.h +index 8177776..5e3dabf 100644 +--- inc/common/UFO/portable_compiler.h ++++ inc/common/UFO/portable_compiler.h +@@ -125,7 +125,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + /* compile-time ASSERT */ + + #ifndef C_ASSERT +- #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 ) ++ #define __UNIQUENAME( a1, a2 ) a1 ## a2 + #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) + + diff --git a/srcpkgs/intel-graphics-compiler/template b/srcpkgs/intel-graphics-compiler/template new file mode 100644 index 00000000000..573d61e6c8a --- /dev/null +++ b/srcpkgs/intel-graphics-compiler/template @@ -0,0 +1,26 @@ +# Template file for 'intel-graphics-compiler' +pkgname=intel-graphics-compiler +version=1.0.3899 +revision=1 +wrksrc=intel-graphics-compiler-igc-${version} +#create_wrksrc=yes +archs="i686* x86_64*" +build_style=cmake +configure_args="-DIGC_PREFERRED_LLVM_VERSION='10.0.0'" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="bison flex" +makedepends="clang-tools-extra llvm10 intel-opencl-clang" +depends="" +short_desc="Intel Graphics Compiler for OpenCL" +maintainer="Stefano Ragni " +license="MIT" +homepage="https://github.com/intel/intel-graphics-compiler" +distfiles="https://github.com/intel/intel-graphics-compiler/archive/igc-${version}.tar.gz" +checksum=fcb721a40a88e1c9bbd45281ba003cf519eaf648435896071bc1e8a80ef05e71 + +post_install() { + vlicense LICENSE.md +} diff --git a/srcpkgs/intel-opencl-clang/template b/srcpkgs/intel-opencl-clang/template new file mode 100644 index 00000000000..fc4a7cfd5fd --- /dev/null +++ b/srcpkgs/intel-opencl-clang/template @@ -0,0 +1,22 @@ +# Template file for 'intel-opencl-clang' +pkgname=intel-opencl-clang +version=10.0.0.1 +_version=10.0.0-1 +revision=1 +wrksrc=opencl-clang-${_version} +#create_wrksrc=yes +archs="i686* x86_64*" +build_style=cmake +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +makedepends="llvm10 SPIRV-LLVM-Translator-devel" +depends="" +short_desc="wrapper library around clang" +maintainer="Stefano Ragni " +license="custom:LLVM" +homepage="https://github.com/intel/opencl-clang" +distfiles="https://github.com/intel/opencl-clang/archive/v${_version}.tar.gz" +checksum=815005b6fb7fd8fd2f08b9036035d3aa9543f5ce8464e41ef2f2ed08a816f507 From 20eb9ba6bff9562c43f6c3d2b52c4c9b9157971b Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 12 May 2020 08:20:13 +0200 Subject: [PATCH 2/7] igc: tmp libpath patch, neo: rm execinfo for now [skip ci] --- srcpkgs/intel-compute-runtime/template | 5 +++-- .../patches/fix-LLVM-library-path.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/intel-graphics-compiler/patches/fix-LLVM-library-path.patch diff --git a/srcpkgs/intel-compute-runtime/template b/srcpkgs/intel-compute-runtime/template index 6d31353efd6..780d2401488 100644 --- a/srcpkgs/intel-compute-runtime/template +++ b/srcpkgs/intel-compute-runtime/template @@ -12,7 +12,8 @@ build_style=cmake #conf_files="" #make_dirs="/var/log/dir 0755 root root" hostmakedepends="pkg-config" -makedepends="intel-gmmlib-devel intel-graphics-compiler libexecinfo-devel" +#makedepends="intel-gmmlib-devel intel-graphics-compiler libexecinfo-devel" TODO +makedepends="intel-gmmlib-devel intel-graphics-compiler" depends="intel-gmmlib intel-graphics-compiler" short_desc="Intel Graphics Compute Runtime for OpenCL (Broadwell+)" maintainer="Stefano Ragni " @@ -21,7 +22,7 @@ homepage="https://github.com/intel/compute-runtime" distfiles="https://github.com/intel/compute-runtime/archive/${version}.tar.gz" checksum=04576130cbb72af19ef6c79092105af7c06df95d7b17769d8fd815fe81c42b12 -CXXFLAGS+=" -lexecinfo" +#CXXFLAGS+=" -lexecinfo" TODO: see if it helps on musl post_install() { vlicense LICENSE diff --git a/srcpkgs/intel-graphics-compiler/patches/fix-LLVM-library-path.patch b/srcpkgs/intel-graphics-compiler/patches/fix-LLVM-library-path.patch new file mode 100644 index 00000000000..b379245dfee --- /dev/null +++ b/srcpkgs/intel-graphics-compiler/patches/fix-LLVM-library-path.patch @@ -0,0 +1,19 @@ +diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt +index 8c9a5fcc..3b5e88cf 100644 +--- IGC/CMakeLists.txt ++++ IGC/CMakeLists.txt +@@ -3271,8 +3271,12 @@ endif() + if(LLVM_LINK_LLVM_DYLIB) + # LLVM was built and configured in a way that tools (in our case IGC) should be linked + # against single LLVM dynamic library. +- set(IGC_BUILD__LLVM_LIBS_TO_LINK "/usr/local/lib/libLLVM-${LLVM_VERSION_MAJOR}.so") +- message(STATUS "[IGC] Link against LLVM dylib ${IGC_BUILD__LLVM_LIBS_TO_LINK}") ++ find_library(IGC_BUILD__LLVM_LIBS_TO_LINK "libLLVM-${LLVM_VERSION_MAJOR}.so") ++ if(IGC_BUILD__LLVM_LIBS_TO_LINK) ++ message(STATUS "[IGC] Link against LLVM dylib ${IGC_BUILD__LLVM_LIBS_TO_LINK}") ++ else() ++ message(FATAL_ERROR "[IGC] Could not find the LLVM dylib. Aborting.") ++ endif() + else() + # LLVM was built into multiple libraries (static or shared). + message(STATUS "[IGC] Link against LLVM static or shared component libs") From a761c3d198346b7467899ab75b468caa8f527770 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 12 May 2020 09:18:22 +0200 Subject: [PATCH 3/7] igt: finish musl patch [skip ci] --- srcpkgs/intel-graphics-compiler/patches/musl.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/srcpkgs/intel-graphics-compiler/patches/musl.patch b/srcpkgs/intel-graphics-compiler/patches/musl.patch index f8f50294678..c42794f3738 100644 --- a/srcpkgs/intel-graphics-compiler/patches/musl.patch +++ b/srcpkgs/intel-graphics-compiler/patches/musl.patch @@ -11,3 +11,13 @@ index 8177776..5e3dabf 100644 #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) +--- visa/CISA.y.orig 2020-05-12 08:57:46.820979512 +0200 ++++ visa/CISA.y 2020-05-12 08:58:14.689978585 +0200 +@@ -25,6 +25,7 @@ + ======================= end_copyright_notice ==================================*/ + + %{ ++#include + #include + #include + #include From 8394a7e76746261a107a511246098a00019f4769 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 12 May 2020 22:16:22 +0200 Subject: [PATCH 4/7] neo: execinfo & RTLD_GLOBAL --- .../patches/musl-rtld-global.patch | 11 +++++++++++ srcpkgs/intel-compute-runtime/template | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/intel-compute-runtime/patches/musl-rtld-global.patch diff --git a/srcpkgs/intel-compute-runtime/patches/musl-rtld-global.patch b/srcpkgs/intel-compute-runtime/patches/musl-rtld-global.patch new file mode 100644 index 00000000000..745d04d0a26 --- /dev/null +++ b/srcpkgs/intel-compute-runtime/patches/musl-rtld-global.patch @@ -0,0 +1,11 @@ +--- shared/source/os_interface/linux/os_library_linux.cpp.orig 2020-05-12 21:02:19.995121993 +0200 ++++ shared/source/os_interface/linux/os_library_linux.cpp 2020-05-12 21:03:20.426124425 +0200 +@@ -30,7 +30,7 @@ + this->handle = dlopen(0, RTLD_LAZY); + } else { + #ifdef SANITIZER_BUILD +- constexpr auto dlopenFlag = RTLD_LAZY; ++ constexpr auto dlopenFlag = RTLD_LAZY | RTLD_GLOBAL; + #else + constexpr auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; + #endif diff --git a/srcpkgs/intel-compute-runtime/template b/srcpkgs/intel-compute-runtime/template index 780d2401488..f1e34b3bed4 100644 --- a/srcpkgs/intel-compute-runtime/template +++ b/srcpkgs/intel-compute-runtime/template @@ -12,7 +12,6 @@ build_style=cmake #conf_files="" #make_dirs="/var/log/dir 0755 root root" hostmakedepends="pkg-config" -#makedepends="intel-gmmlib-devel intel-graphics-compiler libexecinfo-devel" TODO makedepends="intel-gmmlib-devel intel-graphics-compiler" depends="intel-gmmlib intel-graphics-compiler" short_desc="Intel Graphics Compute Runtime for OpenCL (Broadwell+)" @@ -22,7 +21,10 @@ homepage="https://github.com/intel/compute-runtime" distfiles="https://github.com/intel/compute-runtime/archive/${version}.tar.gz" checksum=04576130cbb72af19ef6c79092105af7c06df95d7b17769d8fd815fe81c42b12 -#CXXFLAGS+=" -lexecinfo" TODO: see if it helps on musl +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libexecinfo-devel" + CXXFLAGS+=" -lexecinfo -DSANITIZER_BUILD" +fi post_install() { vlicense LICENSE From 409e0173f5e0da3199164e7c3589afe403573746 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 12 May 2020 23:36:20 +0200 Subject: [PATCH 5/7] neo: more musl patches [skip ci] --- .../patches/musl-ioctl.patch | 14 +++++++++++++ .../patches/musl-pthread_yield.patch | 20 +++++++++++++++++++ .../patches/musl-select.patch | 13 ++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 srcpkgs/intel-compute-runtime/patches/musl-ioctl.patch create mode 100644 srcpkgs/intel-compute-runtime/patches/musl-pthread_yield.patch create mode 100644 srcpkgs/intel-compute-runtime/patches/musl-select.patch diff --git a/srcpkgs/intel-compute-runtime/patches/musl-ioctl.patch b/srcpkgs/intel-compute-runtime/patches/musl-ioctl.patch new file mode 100644 index 00000000000..2accb14d9d2 --- /dev/null +++ b/srcpkgs/intel-compute-runtime/patches/musl-ioctl.patch @@ -0,0 +1,14 @@ +--- opencl/test/unit_test/linux/mock_os_layer.h.orig 2020-05-12 23:23:47.438463587 +0200 ++++ opencl/test/unit_test/linux/mock_os_layer.h 2020-05-12 23:26:38.282470463 +0200 +@@ -20,7 +20,11 @@ + + extern "C" { + int open(const char *pathname, int flags, ...); ++#ifdef __GLIBC__ + int ioctl(int fd, unsigned long int request, ...) throw(); ++#else ++int ioctl(int fd, int request, ...) throw(); ++#endif + } + + extern int (*c_open)(const char *pathname, int flags, ...); diff --git a/srcpkgs/intel-compute-runtime/patches/musl-pthread_yield.patch b/srcpkgs/intel-compute-runtime/patches/musl-pthread_yield.patch new file mode 100644 index 00000000000..2f609838418 --- /dev/null +++ b/srcpkgs/intel-compute-runtime/patches/musl-pthread_yield.patch @@ -0,0 +1,20 @@ +--- opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp.orig 2020-05-12 23:05:41.057419864 +0200 ++++ opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp 2020-05-12 23:06:01.992420706 +0200 +@@ -121,7 +121,7 @@ + + //wait for worker to complete or deadCnt drops + while (!worker->isEmpty() && (deadCnt-- > 0)) +- pthread_yield(); //yield to another threads ++ sched_yield(); //yield to another threads + + worker->close(false); + +@@ -142,7 +142,7 @@ + + //wait for worker to complete or deadCnt drops + while (!worker->isEmpty() && (deadCnt-- > 0)) +- pthread_yield(); //yield to another threads ++ sched_yield(); //yield to another threads + + //and check if GEM was closed + EXPECT_EQ(1, this->drmMock->gem_close_cnt.load()); diff --git a/srcpkgs/intel-compute-runtime/patches/musl-select.patch b/srcpkgs/intel-compute-runtime/patches/musl-select.patch new file mode 100644 index 00000000000..ce64516df04 --- /dev/null +++ b/srcpkgs/intel-compute-runtime/patches/musl-select.patch @@ -0,0 +1,13 @@ +This macro conflicts with the select syscall. Since it isn't actually used, we +just remove it. +--- opencl/source/builtin_kernels_simulation/opencl_c.h.orig 2020-04-30 12:24:42.000000000 +0200 ++++ opencl/source/builtin_kernels_simulation/opencl_c.h 2020-05-12 22:31:37.166337603 +0200 +@@ -220,8 +220,6 @@ + ( \ + (type)var) + +-#define select(a, b, c) (c ? b : a) +- + uint get_local_id(int dim); + uint get_global_id(int dim); + uint get_local_size(int dim); From 28ea7fe571373a32020e4b7280ea4d6ef7fe4594 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Wed, 13 May 2020 10:18:26 +0200 Subject: [PATCH 6/7] neo: disable tests by default, fix style [skip ci] --- srcpkgs/intel-compute-runtime/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/intel-compute-runtime/template b/srcpkgs/intel-compute-runtime/template index f1e34b3bed4..4de974b9d4a 100644 --- a/srcpkgs/intel-compute-runtime/template +++ b/srcpkgs/intel-compute-runtime/template @@ -2,18 +2,12 @@ pkgname=intel-compute-runtime version=20.18.16699 revision=1 -wrksrc=compute-runtime-${version} -#create_wrksrc=yes archs="i686* x86_64*" +wrksrc=compute-runtime-${version} build_style=cmake -#configure_args="" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" hostmakedepends="pkg-config" makedepends="intel-gmmlib-devel intel-graphics-compiler" -depends="intel-gmmlib intel-graphics-compiler" +depends="intel-graphics-compiler" short_desc="Intel Graphics Compute Runtime for OpenCL (Broadwell+)" maintainer="Stefano Ragni " license="MIT" @@ -21,6 +15,10 @@ homepage="https://github.com/intel/compute-runtime" distfiles="https://github.com/intel/compute-runtime/archive/${version}.tar.gz" checksum=04576130cbb72af19ef6c79092105af7c06df95d7b17769d8fd815fe81c42b12 +if [ -z "${XBPS_CHECK_PKGS}" ]; then + configure_args+=" -DSKIP_UNIT_TESTS=1" +fi + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" CXXFLAGS+=" -lexecinfo -DSANITIZER_BUILD" From ac162bda0a65d189bc9e48f4f2c0f88318513f9c Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Wed, 13 May 2020 11:55:26 +0200 Subject: [PATCH 7/7] fix style, some other changes --- srcpkgs/SPIRV-LLVM-Translator/template | 13 ++------- .../patches/musl.patch | 12 ++++---- srcpkgs/intel-graphics-compiler/template | 12 ++------ srcpkgs/intel-opencl-clang/template | 28 +++++++++++-------- 4 files changed, 28 insertions(+), 37 deletions(-) diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template index 1be0ff4278c..cef0a2adc3c 100644 --- a/srcpkgs/SPIRV-LLVM-Translator/template +++ b/srcpkgs/SPIRV-LLVM-Translator/template @@ -3,18 +3,11 @@ pkgname=SPIRV-LLVM-Translator version=10.0.0 revision=1 wrksrc=SPIRV-LLVM-Translator-${version} -#create_wrksrc=yes #archs="i686 x86_64" build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" -#hostmakedepends="llvm10" -makedepends="clang-tools-extra llvm10" -depends="" -short_desc="library and tool for translation between LLVM IR and SPIR-V" +makedepends="clang-tools-extra llvm" +short_desc="Library and tool for translation between LLVM IR and SPIR-V" maintainer="Stefano Ragni " license="custom:LLVM" homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" @@ -26,7 +19,7 @@ post_install() { } SPIRV-LLVM-Translator-devel_package() { - depends="${makedepends} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/intel-graphics-compiler/patches/musl.patch b/srcpkgs/intel-graphics-compiler/patches/musl.patch index c42794f3738..7c802631ec6 100644 --- a/srcpkgs/intel-graphics-compiler/patches/musl.patch +++ b/srcpkgs/intel-graphics-compiler/patches/musl.patch @@ -1,8 +1,6 @@ -diff --git inc/common/UFO/portable_compiler.h inc/common/UFO/portable_compiler.h -index 8177776..5e3dabf 100644 ---- inc/common/UFO/portable_compiler.h -+++ inc/common/UFO/portable_compiler.h -@@ -125,7 +125,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +--- inc/common/UFO/portable_compiler.h.orig 2020-05-13 11:41:37.725900359 +0200 ++++ inc/common/UFO/portable_compiler.h 2020-05-13 11:42:26.407898739 +0200 +@@ -125,7 +125,7 @@ /* compile-time ASSERT */ #ifndef C_ASSERT @@ -11,8 +9,8 @@ index 8177776..5e3dabf 100644 #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) ---- visa/CISA.y.orig 2020-05-12 08:57:46.820979512 +0200 -+++ visa/CISA.y 2020-05-12 08:58:14.689978585 +0200 +--- visa/CISA.y.orig 2020-05-13 11:42:12.245899211 +0200 ++++ visa/CISA.y 2020-05-13 11:42:26.410898739 +0200 @@ -25,6 +25,7 @@ ======================= end_copyright_notice ==================================*/ diff --git a/srcpkgs/intel-graphics-compiler/template b/srcpkgs/intel-graphics-compiler/template index 573d61e6c8a..30c3262e45e 100644 --- a/srcpkgs/intel-graphics-compiler/template +++ b/srcpkgs/intel-graphics-compiler/template @@ -2,18 +2,12 @@ pkgname=intel-graphics-compiler version=1.0.3899 revision=1 -wrksrc=intel-graphics-compiler-igc-${version} -#create_wrksrc=yes archs="i686* x86_64*" +wrksrc=intel-graphics-compiler-igc-${version} build_style=cmake -configure_args="-DIGC_PREFERRED_LLVM_VERSION='10.0.0'" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" +configure_args="-DIGC_PREFERRED_LLVM_VERSION='10.0.0' -Wno-dev" hostmakedepends="bison flex" -makedepends="clang-tools-extra llvm10 intel-opencl-clang" -depends="" +makedepends="clang-tools-extra llvm intel-opencl-clang-devel" short_desc="Intel Graphics Compiler for OpenCL" maintainer="Stefano Ragni " license="MIT" diff --git a/srcpkgs/intel-opencl-clang/template b/srcpkgs/intel-opencl-clang/template index fc4a7cfd5fd..55c478def2e 100644 --- a/srcpkgs/intel-opencl-clang/template +++ b/srcpkgs/intel-opencl-clang/template @@ -1,22 +1,28 @@ # Template file for 'intel-opencl-clang' pkgname=intel-opencl-clang version=10.0.0.1 -_version=10.0.0-1 revision=1 -wrksrc=opencl-clang-${_version} -#create_wrksrc=yes +_version=10.0.0-1 archs="i686* x86_64*" +wrksrc=opencl-clang-${_version} build_style=cmake -#configure_args="" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" -makedepends="llvm10 SPIRV-LLVM-Translator-devel" -depends="" -short_desc="wrapper library around clang" +makedepends="clang-tools-extra llvm SPIRV-LLVM-Translator-devel" +short_desc="Wrapper library to compile OpenCL C kernels to SPIR-V modules" maintainer="Stefano Ragni " license="custom:LLVM" homepage="https://github.com/intel/opencl-clang" distfiles="https://github.com/intel/opencl-clang/archive/v${_version}.tar.gz" checksum=815005b6fb7fd8fd2f08b9036035d3aa9543f5ce8464e41ef2f2ed08a816f507 + +post_install() { + vlicense LICENSE +} + +intel-opencl-clang-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +}