diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2020-06-04 06:58:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 06:58:33 -0700 |
| commit | b64ec7fba4c512f6abcfc51b7b2c5c92907bbeda (patch) | |
| tree | 570697ef5c2f41e5ed2627d00930681802b3b919 | |
| parent | 7617054a5d50633930b0e08f3208b81f55b35dee (diff) | |
| download | spack-b64ec7fba4c512f6abcfc51b7b2c5c92907bbeda.tar.gz spack-b64ec7fba4c512f6abcfc51b7b2c5c92907bbeda.tar.bz2 spack-b64ec7fba4c512f6abcfc51b7b2c5c92907bbeda.tar.xz spack-b64ec7fba4c512f6abcfc51b7b2c5c92907bbeda.zip | |
pass hwloc to configure via useropt; use lib/ or lib64/ as appropriate for libunwind (#16941)
| -rw-r--r-- | var/spack/repos/builtin/packages/tau/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/tau/unwind.patch | 34 |
2 files changed, 37 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 5a4d704c43..1d2dea580b 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -107,6 +107,8 @@ class Tau(Package): conflicts('+adios2', when='@:2.29.1') conflicts('+sqlite', when='@:2.29.1') + patch('unwind.patch', when="@2.29") + def set_compiler_options(self, spec): useropt = ["-O2 -g", self.rpath_args] @@ -144,6 +146,7 @@ class Tau(Package): def setup_build_environment(self, env): env.prepend_path('LIBRARY_PATH', self.spec['zlib'].prefix.lib) + env.prepend_path('LIBRARY_PATH', self.spec['hwloc'].prefix.lib) def install(self, spec, prefix): # TAU isn't happy with directories that have '@' in the path. Sigh. diff --git a/var/spack/repos/builtin/packages/tau/unwind.patch b/var/spack/repos/builtin/packages/tau/unwind.patch new file mode 100644 index 0000000000..1d9faa4cc6 --- /dev/null +++ b/var/spack/repos/builtin/packages/tau/unwind.patch @@ -0,0 +1,34 @@ +From 3b60cbcab167f8f1cf450f0319850bfa88f39d3a Mon Sep 17 00:00:00 2001 +From: eugeneswalker <eugenesunsetwalker@gmail.com> +Date: Thu, 4 Jun 2020 06:12:41 -0700 +Subject: [PATCH] check for unwind_dir/lib and unwind_dir/lib64 + +--- + configure | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3bd7430..b673cdf 100755 +--- a/configure ++++ b/configure +@@ -1662,8 +1662,15 @@ for arg in "$@"; do + -unwind=*) + unwind_dir=`echo $arg | sed -e 's/-unwind=//'` + if [ $unwind_dir != "/usr" ]; then +- unwind_inc="$unwind_dir/include" +- unwind_lib="$unwind_dir/lib" ++ unwind_inc="$unwind_dir/include" ++ unwind_lib="" ++ if [[ -d "$unwind_dir/lib" ]] ; then ++ unwind_lib="$unwind_dir/lib" ++ elif [[ -d "$unwind_dir/lib64" ]] ; then ++ unwind_lib="$unwind_dir/lib64" ++ else ++ exit 1 ++ fi + fi + # So that the user doesn't have to specify the unwinder, + # use libunwind as the default. +-- +2.24.2 (Apple Git-127) + |