diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2016-09-09 09:56:11 -0400 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-09-09 06:56:11 -0700 |
| commit | 8249108cc6ef82b954ed5b5eabaff88be42ee2b8 (patch) | |
| tree | 93e6583e5a8b6dc2998f4d588a5c9a7d43a79bc0 /var | |
| parent | e06a0271a4400f24016fa308e958fa5f114ba06d (diff) | |
| download | spack-8249108cc6ef82b954ed5b5eabaff88be42ee2b8.tar.gz spack-8249108cc6ef82b954ed5b5eabaff88be42ee2b8.tar.bz2 spack-8249108cc6ef82b954ed5b5eabaff88be42ee2b8.tar.xz spack-8249108cc6ef82b954ed5b5eabaff88be42ee2b8.zip | |
Qthreads: Switch back to using tarball to get released version (#1739)
* Qthreads: Switch back to using tarball for download
* Don't require autotools any more
* Re-enable autotools
* Remove autotools again
* Use .tar.bz tarball; remove outdated code
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qthreads/ldflags.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qthreads/package.py | 17 |
2 files changed, 2 insertions, 26 deletions
diff --git a/var/spack/repos/builtin/packages/qthreads/ldflags.patch b/var/spack/repos/builtin/packages/qthreads/ldflags.patch deleted file mode 100644 index 0c15eab386..0000000000 --- a/var/spack/repos/builtin/packages/qthreads/ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -40456,7 +40456,7 @@ - hwloc_saved_LDFLAGS="$LDFLAGS" - if test "x$with_hwloc" != x; then - CPPFLAGS="-I$with_hwloc/include $CPPFLAGS" -- LDFLAGS="-L$with_hwloc/lib $CPPFLAGS" -+ LDFLAGS="-L$with_hwloc/lib $LDFLAGS" - fi - - diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py index 8d5cc87062..c68d8dba6c 100644 --- a/var/spack/repos/builtin/packages/qthreads/package.py +++ b/var/spack/repos/builtin/packages/qthreads/package.py @@ -38,28 +38,15 @@ class Qthreads(Package): attain either state.""" homepage = "http://www.cs.sandia.gov/qthreads/" - # Google Code has stopped serving tarballs - # We assume the tarballs will soon be available on Github instead - # url = "https://qthreads.googlecode.com/files/qthread-1.10.tar.bz2" - # version('1.10', '5af8c8bbe88c2a6d45361643780d1671') + url = "https://github.com/Qthreads/qthreads/releases/download/1.10/qthread-1.10.tar.bz2" + version("1.10", "d1cf3cf3f30586921359f7840171e551") - # Temporarily install from a git branch - url = "https://github.com/Qthreads/qthreads" - version("1.10", - git="https://github.com/Qthreads/qthreads", - branch="release-1.10") - - # patch("ldflags.patch") patch("restrict.patch") patch("trap.patch") - depends_on("autoconf", type="build") - depends_on("automake", type="build") depends_on("hwloc") def install(self, spec, prefix): - autogen = Executable("./autogen.sh") - autogen() configure("--prefix=%s" % prefix, "--enable-guard-pages", "--with-topology=hwloc", |