diff options
| author | ketsubouchi <67359246+ketsubouchi@users.noreply.github.com> | 2020-08-09 22:01:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 15:01:19 +0200 |
| commit | c6ad3218380e2ef974a5d602f311daac187834ae (patch) | |
| tree | 7c97fe66c24ad9481b8a759ef128ebb5d393cb0b | |
| parent | e83f639c13031cfb658a77372757952a8ab8f748 (diff) | |
| download | spack-c6ad3218380e2ef974a5d602f311daac187834ae.tar.gz spack-c6ad3218380e2ef974a5d602f311daac187834ae.tar.bz2 spack-c6ad3218380e2ef974a5d602f311daac187834ae.tar.xz spack-c6ad3218380e2ef974a5d602f311daac187834ae.zip | |
r-rcppparallel: fix for fujitsu compiler (#17924)
| -rw-r--r-- | var/spack/repos/builtin/packages/r-rcppparallel/asclang.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/r-rcppparallel/package.py | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/r-rcppparallel/asclang.patch b/var/spack/repos/builtin/packages/r-rcppparallel/asclang.patch new file mode 100644 index 0000000000..02718a152a --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rcppparallel/asclang.patch @@ -0,0 +1,12 @@ +diff -u -r -N a/src/Makevars.in b/src/Makevars.in +--- a/src/Makevars.in 2020-08-06 09:31:48.000000000 +0900 ++++ b/src/Makevars.in 2020-08-06 09:34:01.000000000 +0900 +@@ -87,6 +87,8 @@ + cd tbb/src; \ + if [ -n "$(shell echo $(CC) | grep clang)" ]; then \ + $(MAKE_CMD) stdver=@STDVER@ compiler=clang $(MAKE_ARGS); \ ++ elif [ -n "$(shell echo $(CC) | grep fcc)" ]; then \ ++ $(MAKE_CMD) stdver=@STDVER@ compiler=clang $(MAKE_ARGS); \ + elif [ -n "$(shell echo $(CC) | grep gcc)" ]; then \ + $(MAKE_CMD) stdver=@STDVER@ compiler=gcc $(MAKE_ARGS); \ + else \ diff --git a/var/spack/repos/builtin/packages/r-rcppparallel/package.py b/var/spack/repos/builtin/packages/r-rcppparallel/package.py index 0e172ca491..4f4459c990 100644 --- a/var/spack/repos/builtin/packages/r-rcppparallel/package.py +++ b/var/spack/repos/builtin/packages/r-rcppparallel/package.py @@ -20,3 +20,5 @@ class RRcppparallel(RPackage): depends_on('r@3.0.2:', type=('build', 'run')) depends_on('gmake', type='build') + + patch('asclang.patch', when='%fj') |