Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve recipes, including for AL9 #163

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/cairo/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def configure_args(self):
args.extend(self.enable_or_disable("gobject"))
args.extend(self.enable_or_disable("ft"))
args.extend(self.enable_or_disable("fc"))
args.append("--disable-dependency-tracking")

return args

Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/libunwind/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class Libunwind(AutotoolsPackage):
depends_on("zlib", type="link", when="+zlib")

conflicts("platform=darwin", msg="Non-GNU libunwind needs ELF libraries Darwin does not have")
conflicts("%gcc@:4.9", when="@1.6:", msg="libunwind >=1.6 requires stdatomic.h")

provides("unwind")

Expand Down
5 changes: 5 additions & 0 deletions var/spack/repos/builtin/packages/perl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package
variant("shared", default=True, description="Build a shared libperl.so library")
variant("threads", default=True, description="Build perl with threads support")
variant("open", default=True, description="Support open.pm")
variant("opcode", default=True, description="Support Opcode.pm")

resource(
name="cpanm",
Expand Down Expand Up @@ -200,6 +201,10 @@ def determine_variants(cls, exes, version):
fail_on_error=False,
)
variants += "+open" if perl.returncode == 0 else "~open"
# this is just to detect incomplete installs
# normally perl installs Opcode.pm
perl("-e", "use Opcode", output=os.devnull, error=os.devnull, fail_on_error=False)
variants += "+opcode" if perl.returncode == 0 else "~opcode"
return variants

# On a lustre filesystem, patch may fail when files
Expand Down
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/postgresql/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Postgresql(AutotoolsPackage):
depends_on("libedit", when="lineedit=libedit")
depends_on("openssl")
depends_on("tcl", when="+tcl")
depends_on("perl", when="+perl")
depends_on("perl+opcode", when="+perl")
depends_on("python", when="+python")
depends_on("libxml2", when="+xml")

Expand Down
18 changes: 10 additions & 8 deletions var/spack/repos/builtin/packages/range-v3/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import shutil

from spack.package import *
from spack.pkg.builtin.boost import Boost


class RangeV3(CMakePackage):
Expand Down Expand Up @@ -67,13 +66,16 @@ class RangeV3(CMakePackage):

depends_on("cmake@3.6:", type="build")
depends_on("doxygen+graphviz", type="build", when="+doc")
depends_on("boost@1.59.0: cxxstd=14", type="build", when="+examples cxxstd=14")
depends_on("boost@1.59.0: cxxstd=17", type="build", when="+examples cxxstd=17")

# TODO: replace this with an explicit list of components of Boost,
# for instance depends_on('boost +filesystem')
# See https://github.com/spack/spack/pull/22303 for reference
depends_on(Boost.with_default_variants, type="build")
depends_on(
"boost+date_time+program_options@1.59.0: cxxstd=14",
type="build",
when="+examples cxxstd=14",
)
depends_on(
"boost+date_time+program_options@1.59.0: cxxstd=17",
type="build",
when="+examples cxxstd=17",
)

# Fix reported upstream issue
# https://github.com/ericniebler/range-v3/issues/1196 per PR
Expand Down