diff options
| -rwxr-xr-x | lib/spack/env/cc | 6 | ||||
| -rw-r--r-- | lib/spack/spack/globals.py | 1 | ||||
| -rw-r--r-- | lib/spack/spack/packages/graphlib.py | 33 | ||||
| -rw-r--r-- | lib/spack/spack/packages/mrnet.py | 32 |
4 files changed, 72 insertions, 0 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index 0245e06531..a258bdb49d 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -29,6 +29,11 @@ spack_env_path = get_path("SPACK_ENV_PATH") # Figure out what type of operation we're doing command = os.path.basename(sys.argv[0]) cpp, cc, ccld, ld = range(4) + +# TODO: this can to be removed once Jira issue SPACK-16 is resolved +if command == 'CC': + command = 'c++' + if command == 'cpp': mode = cpp elif command == 'ld': @@ -90,6 +95,7 @@ for item in ['.'] + spack_env_path: os.environ["PATH"] = ":".join(clean_path) full_command = [command] + arguments + if spack_debug: input_log = os.path.join(spack_build_root, 'spack_cc_in.log') output_log = os.path.join(spack_build_root, 'spack_cc_out.log') diff --git a/lib/spack/spack/globals.py b/lib/spack/spack/globals.py index 40bb50f219..6ff1a69304 100644 --- a/lib/spack/spack/globals.py +++ b/lib/spack/spack/globals.py @@ -70,6 +70,7 @@ editor = Executable(os.environ.get("EDITOR", "")) # Curl tool for fetching files. curl = which("curl", required=True) +curl.add_default_arg("-k") # TODO: remove me in favor of spack -k` # Whether to build in tmp space or directly in the stage_path. # If this is true, then spack will make stage directories in diff --git a/lib/spack/spack/packages/graphlib.py b/lib/spack/spack/packages/graphlib.py new file mode 100644 index 0000000000..4f1e610441 --- /dev/null +++ b/lib/spack/spack/packages/graphlib.py @@ -0,0 +1,33 @@ +# FIXME: +# This is a template package file for Spack. We've conveniently +# put "FIXME" labels next to all the things you'll want to change. +# +# Once you've edited all the FIXME's, delete this whole message, +# save this file, and test out your package like this: +# +# spack install v +# +# You can always get back here to change things with: +# +# spack edit v +# +# See the spack documentation for more information on building +# packages. +# +from spack import * + +class Graphlib(Package): + """Library to create, manipulate, and export graphs Graphlib.""" + # FIXME: add a proper url for your package's homepage here. + homepage = "http://www.example.com" + url = "https://github.com/lee218llnl/graphlib/archive/v2.0.0.tar.gz" + + versions = { '2.0.0' : '43c6df84f1d38ba5a5dce0ae19371a70', } + + def install(self, spec, prefix): + # FIXME: Modify the configure line to suit your build system here. + cmake(".", *std_cmake_args) + + # FIXME: Add logic to build and install here + make() + make("install") diff --git a/lib/spack/spack/packages/mrnet.py b/lib/spack/spack/packages/mrnet.py new file mode 100644 index 0000000000..e7218be0d4 --- /dev/null +++ b/lib/spack/spack/packages/mrnet.py @@ -0,0 +1,32 @@ +# FIXME: +# This is a template package file for Spack. We've conveniently +# put "FIXME" labels next to all the things you'll want to change. +# +# Once you've edited all the FIXME's, delete this whole message, +# save this file, and test out your package like this: +# +# spack install mrnet +# +# You can always get back here to change things with: +# +# spack edit mrnet +# +# See the spack documentation for more information on building +# packages. +# +from spack import * + +class Mrnet(Package): + """The MRNet Multi-Cast Reduction Network.""" + homepage = "http://paradyn.org/mrnet" + url = "ftp://ftp.cs.wisc.edu/paradyn/mrnet/mrnet_4.0.0.tar.gz" + + versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', } + + def install(self, spec, prefix): + # FIXME: Modify the configure line to suit your build system here. + configure("--prefix=%s" %prefix, "--enable-shared") + + # FIXME: Add logic to build and install here + make(parallel=False) + make("install", parallel=False) |