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.

Sign up for GitHub

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

Update gcc package from spack/develop: add gcc@13 and other minor updates #441

Merged
merged 5 commits into from
Jun 12, 2024
+17 −1
Merged

Update gcc package from spack/develop: add gcc@13 and other minor updates #441

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2c2163
gcc: add v13.3.0 (#44306)
zzzoom May 22, 2024
cb6296f
gcc: add mold variant to use mold by default (#44117)
msimberg Jun 4, 2024
07f478f
Add homebrew [email protected] patch for aarch64 darwin (#44280)
Chrismarsh May 21, 2024
d8feea8
gcc: use -rpath {rpath_dir} not -rpath={rpath dir} (#44315)
haampie May 22, 2024
1fc9a26
Merge branch 'spack-stack-dev' into feature/pull_gcc_13_from_spack_de…
climbfuji Jun 12, 2024
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
18 changes: 17 additions & 1 deletion var/spack/repos/builtin/packages/gcc/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage, CompilerPackage):

version("14.1.0", sha256="e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840")

version("13.3.0", sha256="0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083")
version("13.2.0", sha256="e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da")
version("13.1.0", sha256="61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86")

Expand Down Expand Up @@ -129,6 +130,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage, CompilerPackage):
description="Compilers and runtime libraries to build",
)
variant("binutils", default=False, description="Build via binutils")
variant("mold", default=False, description="Use mold as the linker by default", when="@12:")
variant(
"piclibs", default=False, description="Build PIC versions of libgfortran.a and libstdc++.a"
)
Expand Down Expand Up @@ -193,6 +195,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage, CompilerPackage):
depends_on(
"binutils+gas+ld+plugins~libiberty", when="+binutils", type=("build", "link", "run")
)
depends_on("mold", when="+mold")
depends_on("zip", type="build", when="languages=java")

# The server is sometimes a bit slow to respond
Expand Down Expand Up @@ -422,6 +425,11 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage, CompilerPackage):
sha256="2df7ef067871a30b2531a2013b3db661ec9e61037341977bfc451e30bf2c1035",
when="@13.2.0 target=aarch64:",
)
patch(
"https://raw.githubusercontent.com/Homebrew/formula-patches/82b5c1cd38826ab67ac7fc498a8fe74376a40f4a/gcc/gcc-14.1.0.diff",
sha256="1529cff128792fe197ede301a81b02036c8168cb0338df21e4bc7aafe755305a",
when="@14.1.0 target=aarch64:",
)
conflicts("+bootstrap", when="@11.3.0,13.1: target=aarch64:")

# Use -headerpad_max_install_names in the build,
Expand Down Expand Up @@ -968,11 +976,19 @@ def write_specs_file(self):

# rpath
if rpath_dir:
f.write(f"*link_libgcc:\n+ -rpath={rpath_dir}\n\n")
f.write(f"*link_libgcc:\n+ -rpath {rpath_dir}\n\n")

# programs search path
if self.spec.satisfies("+binutils"):
f.write(f"*self_spec:\n+ -B{self.spec['binutils'].prefix.bin}\n\n")

# set -fuse-ld=mold as the default linker when +mold
if self.spec.satisfies("+mold"):
f.write(
f"*self_spec:\n+ -B{self.spec['mold'].prefix.bin} "
"%{!fuse-ld*:-fuse-ld=mold}\n\n"
)

set_install_permissions(specs_file)
tty.info(f"Wrote new spec file to {specs_file}")

Expand Down
Loading