diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-05-05 00:53:47 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-05-05 00:53:47 -0700 |
| commit | d00680a88357434848a177536c062d2e7e904813 (patch) | |
| tree | 6affe259cd5c96e4ff904fc76b85e5a6657335d7 /var | |
| parent | c7f23ca0d665a861b3dfae49d2a6a53f1cd1aded (diff) | |
| parent | 40d578be958b7bc0269f2f6f92cc2b6e70a43353 (diff) | |
| download | spack-d00680a88357434848a177536c062d2e7e904813.tar.gz spack-d00680a88357434848a177536c062d2e7e904813.tar.bz2 spack-d00680a88357434848a177536c062d2e7e904813.tar.xz spack-d00680a88357434848a177536c062d2e7e904813.zip | |
Merge pull request #886 from eschnett/eschnett/openblas-make
Disable OpenBLAS's overriding of our "make -jN" option
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/make.patch | 35 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/package.py | 4 |
2 files changed, 38 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/openblas/make.patch b/var/spack/repos/builtin/packages/openblas/make.patch new file mode 100644 index 0000000000..851214211a --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/make.patch @@ -0,0 +1,35 @@ +diff --git a/Makefile.system b/Makefile.system +index b89f60e..2dbdad0 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -139,6 +139,10 @@ NO_PARALLEL_MAKE=0 + endif + GETARCH_FLAGS += -DNO_PARALLEL_MAKE=$(NO_PARALLEL_MAKE) + ++ifdef MAKE_NO_J ++GETARCH_FLAGS += -DMAKE_NO_J=$(MAKE_NO_J) ++endif ++ + ifdef MAKE_NB_JOBS + GETARCH_FLAGS += -DMAKE_NB_JOBS=$(MAKE_NB_JOBS) + endif +diff --git a/getarch.c b/getarch.c +index f9c49e6..dffad70 100644 +--- a/getarch.c ++++ b/getarch.c +@@ -1012,6 +1012,7 @@ int main(int argc, char *argv[]){ + #endif + #endif + ++#ifndef MAKE_NO_J + #ifdef MAKE_NB_JOBS + printf("MAKE += -j %d\n", MAKE_NB_JOBS); + #elif NO_PARALLEL_MAKE==1 +@@ -1021,6 +1022,7 @@ int main(int argc, char *argv[]){ + printf("MAKE += -j %d\n", get_num_cores()); + #endif + #endif ++#endif + + break; + diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index f5d656f659..99649da9ca 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -20,13 +20,15 @@ class Openblas(Package): provides('blas') provides('lapack') + patch('make.patch') def install(self, spec, prefix): # Openblas is picky about compilers. Configure fails with # FC=/abs/path/to/f77, whereas FC=f77 works fine. # To circumvent this, provide basename only: make_defs = ['CC=%s' % os.path.basename(spack_cc), - 'FC=%s' % os.path.basename(spack_f77)] + 'FC=%s' % os.path.basename(spack_f77), + 'MAKE_NO_J=1'] make_targets = ['libs', 'netlib'] |