summaryrefslogtreecommitdiff
path: root/var/spack/repos/builtin/packages/ispc
diff options
context:
space:
mode:
authorMartin Aumüller <aumuell@reserv.at>2020-10-21 02:00:45 +0200
committerGitHub <noreply@github.com>2020-10-20 19:00:45 -0500
commit0e6b818c5211e1b74016bda1f67c474e14cfda2f (patch)
tree31f167f80190d843a24b11fae539614e8e6b384e /var/spack/repos/builtin/packages/ispc
parent03611f2e89854a7aa6424cfb93319b5fc7fd8be3 (diff)
downloadspack-0e6b818c5211e1b74016bda1f67c474e14cfda2f.tar.gz
spack-0e6b818c5211e1b74016bda1f67c474e14cfda2f.tar.bz2
spack-0e6b818c5211e1b74016bda1f67c474e14cfda2f.tar.xz
spack-0e6b818c5211e1b74016bda1f67c474e14cfda2f.zip
Add new packages: ispc & embree (#19361)
* Add new package: ispc * Add new package: embree
Diffstat (limited to 'var/spack/repos/builtin/packages/ispc')
-rw-r--r--var/spack/repos/builtin/packages/ispc/don-t-assume-that-ncurses-zlib-are-system-libraries.patch28
-rw-r--r--var/spack/repos/builtin/packages/ispc/fix-linking-against-llvm-10.patch26
-rw-r--r--var/spack/repos/builtin/packages/ispc/package.py49
3 files changed, 103 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ispc/don-t-assume-that-ncurses-zlib-are-system-libraries.patch b/var/spack/repos/builtin/packages/ispc/don-t-assume-that-ncurses-zlib-are-system-libraries.patch
new file mode 100644
index 0000000000..3e28049c44
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ispc/don-t-assume-that-ncurses-zlib-are-system-libraries.patch
@@ -0,0 +1,28 @@
+From 44250379632ace94b08ff2dba17c69d3f36d5ffb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Aumu=CC=88ller?= <aumuell@reserv.at>
+Date: Sun, 27 Sep 2020 20:23:42 +0200
+Subject: [PATCH] don't assume that ncurses & zlib are system libraries
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2bb4a7e6..53239a88 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -473,7 +473,10 @@ else()
+ if (ISPC_STATIC_LINK)
+ target_link_libraries(${PROJECT_NAME} pthread z.a tinfo.a curses.a)
+ else()
+- target_link_libraries(${PROJECT_NAME} pthread z tinfo curses)
++ find_package(Curses REQUIRED)
++ find_package(ZLIB REQUIRED)
++ find_library(NCURSES_TINFO_LIBRARY tinfo)
++ target_link_libraries(${PROJECT_NAME} pthread ${ZLIB_LIBRARIES} ${NCURSES_TINFO_LIBRARY} ${CURSES_LIBRARIES})
+ endif()
+ endif()
+ endif()
+--
+2.29.0
+
diff --git a/var/spack/repos/builtin/packages/ispc/fix-linking-against-llvm-10.patch b/var/spack/repos/builtin/packages/ispc/fix-linking-against-llvm-10.patch
new file mode 100644
index 0000000000..4ae7d15777
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ispc/fix-linking-against-llvm-10.patch
@@ -0,0 +1,26 @@
+From 0b68b43ec71130e1167d9ff59d5f874be47a9414 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Aumu=CC=88ller?= <aumuell@reserv.at>
+Date: Sun, 18 Oct 2020 21:02:32 +0200
+Subject: [PATCH] fix linking against llvm 10
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 68759c14..f4499c8f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -401,6 +401,9 @@ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
+ if (WIN32)
+ target_link_libraries(${PROJECT_NAME} version.lib shlwapi.lib odbc32.lib odbccp32.lib)
+ else()
++ if (CMAKE_DL_LIBS)
++ target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS})
++ endif()
+ if (APPLE)
+ target_link_libraries(${PROJECT_NAME} pthread z curses)
+ else()
+--
+2.28.0
+
diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py
new file mode 100644
index 0000000000..4532e45243
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ispc/package.py
@@ -0,0 +1,49 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+# ispc requires <gnu/stubs-32.h>, e.g. from
+# glibc-devel.i686 (CentoOS) or libc6-dev-i386 and g++-multilib (Ubuntu)
+
+
+from spack import *
+
+
+class Ispc(CMakePackage):
+ """Intel Implicit SPMD Program Compiler
+
+ An open-source compiler for high-performance SIMD programming on the CPU"""
+
+ homepage = "https://ispc.github.io"
+ url = "https://github.com/ispc/ispc/tarball/v1.14.1"
+ maintainers = ['aumuell']
+
+ version('1.14.1', sha256='ca12f26dafbc4ef9605487d03a2156331c1351a4ffefc9bab4d896a466880794')
+ version('1.14.0', sha256='1ed72542f56738c632bb02fb0dd56ad8aec3e2487839ebbc0def8334f305a4c7')
+ version('1.13.0', sha256='aca595508b51dd1ff065c406a3fd7c93822320c510077dd4d97a2b98a23f097a')
+
+ depends_on('python', type='build')
+ depends_on('bison', type='build')
+ depends_on('flex', type='build')
+ depends_on('ncurses', type='link')
+ depends_on('zlib', type='link')
+ depends_on('llvm~libcxx')
+ depends_on('llvm@10:', when='@1.14:')
+ depends_on('llvm@10:10.999', when='@1.13:1.13.999')
+
+ patch('don-t-assume-that-ncurses-zlib-are-system-libraries.patch',
+ sha256='d3ccf547d3ba59779fd375e10417a436318f2200d160febb9f830a26f0daefdc')
+
+ patch('fix-linking-against-llvm-10.patch', when='@1.13:1.13.999',
+ sha256='d3ccf547d3ba59779fd375e10417a436318f2200d160febb9f830a26f0daefdc')
+
+ def cmake_args(self):
+ args = []
+ args.append('-DARM_ENABLED=FALSE')
+ args.append('-DISPC_NO_DUMPS=ON') # otherwise, LLVM needs patching
+ args.append('-DISPC_INCLUDE_EXAMPLES=OFF')
+ args.append('-DISPC_INCLUDE_TESTS=OFF')
+ args.append('-DISPC_INCLUDE_UTILS=OFF')
+ return args