diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-02-03 10:37:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 10:37:14 +0100 |
| commit | 2ada0fa5a2a406569bbc4a3c150c6dbf0e2dc526 (patch) | |
| tree | e98c4f04673e1b840b0ba152f96bcebda49c2c47 /var | |
| parent | 18b83c3833c0e138a7153bbb14e68b1147b3f3d1 (diff) | |
| download | spack-2ada0fa5a2a406569bbc4a3c150c6dbf0e2dc526.tar.gz spack-2ada0fa5a2a406569bbc4a3c150c6dbf0e2dc526.tar.bz2 spack-2ada0fa5a2a406569bbc4a3c150c6dbf0e2dc526.tar.xz spack-2ada0fa5a2a406569bbc4a3c150c6dbf0e2dc526.zip | |
julia: fix gfortran version detection (#28741)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/julia/fix-gfortran.patch | 22 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/julia/package.py | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/julia/fix-gfortran.patch b/var/spack/repos/builtin/packages/julia/fix-gfortran.patch new file mode 100644 index 0000000000..22749aca57 --- /dev/null +++ b/var/spack/repos/builtin/packages/julia/fix-gfortran.patch @@ -0,0 +1,22 @@ +From 23b8403586be314449c42b35b85d45be16a02373 Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <harmenstoppels@gmail.com> +Date: Thu, 3 Feb 2022 01:56:41 +0100 +Subject: [PATCH] Fix detection of LIBGFORTRAN_VERSION + +--- + Make.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.inc b/Make.inc +index 6b9db8d9fa33..ec956d1d0c86 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -1140,7 +1140,7 @@ endif + + # Auto-detect triplet once, create different versions that we use as defaults below for each BB install target + FC_VERSION := $(shell $(FC) --version 2>/dev/null | head -1) +-FC_OR_CC_VERISON := $(or $(FC_VERSION),$(shell $(CC) --version 2>/dev/null | head -1)) ++FC_OR_CC_VERSION := $(or $(FC_VERSION),$(shell $(CC) --version 2>/dev/null | head -1)) + BB_TRIPLET_LIBGFORTRAN_CXXABI := $(shell $(call invoke_python,$(JULIAHOME)/contrib/normalize_triplet.py) $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(FC_OR_CC_VERSION)" "$(or $(shell echo '\#include <string>' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' ),1)") + BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))) + BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))) diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 2888747222..5223a5a3ce 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -117,6 +117,9 @@ class Julia(MakefilePackage): patch('julia-1.6-system-libwhich-and-p7zip-symlink.patch', when='@1.6.0:1.6') patch('use-add-rpath.patch') + # Fix gfortran abi detection https://github.com/JuliaLang/julia/pull/44026 + patch('fix-gfortran.patch', when='@1.7.0:1.7.1') + def patch(self): # The system-libwhich-libblastrampoline.patch causes a rebuild of docs as it # touches the main Makefile, so we reset the a/m-time to doc/_build's. |