diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-15 15:46:23 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-22 17:08:13 +0200 |
| commit | f20de6161bc0e83800e6f112994186ca20bd6b71 (patch) | |
| tree | bcf098e5c9260ba4376671f9eb23768ca6095329 | |
| parent | a5c6bd38c15b79c0ad59f3d9545d9a3b713b5575 (diff) | |
| download | guix-f20de6161bc0e83800e6f112994186ca20bd6b71.tar.gz | |
gnu: ATLAS: Fix build with GCC 10.
* gnu/packages/patches/atlas-gfortran-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/maths.scm (atlas)[source](patches): New field.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/atlas-gfortran-compat.patch | 37 |
3 files changed, 39 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index add01cf6d2..7fc15993d7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -817,6 +817,7 @@ dist_patch_DATA = \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ + %D%/packages/patches/atlas-gfortran-compat.patch \ %D%/packages/patches/audacity-build-with-system-portaudio.patch \ %D%/packages/patches/audacity-add-include.patch \ %D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 91f1cd6126..8c11825c34 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4114,6 +4114,7 @@ packages.") (method url-fetch) (uri (string-append "mirror://sourceforge/math-atlas/Stable/" version "/atlas" version ".tar.bz2")) + (patches (search-patches "atlas-gfortran-compat.patch")) (sha256 (base32 "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216")))) diff --git a/gnu/packages/patches/atlas-gfortran-compat.patch b/gnu/packages/patches/atlas-gfortran-compat.patch new file mode 100644 index 0000000000..5b46f5a64d --- /dev/null +++ b/gnu/packages/patches/atlas-gfortran-compat.patch @@ -0,0 +1,37 @@ +Fix build with gfortran 10. + +Taken from Debian: +https://salsa.debian.org/science-team/atlas/-/blob/master/debian/patches/gfortran-10.patch + +--- a/interfaces/blas/C/testing/c_dblat1.f ++++ b/interfaces/blas/C/testing/c_dblat1.f +@@ -247,11 +247,11 @@ + IF (ICASE.EQ.7) THEN + * .. DNRM2TEST .. + STEMP(1) = DTRUE1(NP1) +- CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC) ++ CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC) + ELSE IF (ICASE.EQ.8) THEN + * .. DASUMTEST .. + STEMP(1) = DTRUE3(NP1) +- CALL STEST1(DASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC) ++ CALL STEST1(DASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC) + ELSE IF (ICASE.EQ.9) THEN + * .. DSCALTEST .. + CALL DSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX) +--- a/interfaces/blas/C/testing/c_sblat1.f ++++ b/interfaces/blas/C/testing/c_sblat1.f +@@ -247,11 +247,11 @@ + IF (ICASE.EQ.7) THEN + * .. SNRM2TEST .. + STEMP(1) = DTRUE1(NP1) +- CALL STEST1(SNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC) ++ CALL STEST1(SNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC) + ELSE IF (ICASE.EQ.8) THEN + * .. SASUMTEST .. + STEMP(1) = DTRUE3(NP1) +- CALL STEST1(SASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC) ++ CALL STEST1(SASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC) + ELSE IF (ICASE.EQ.9) THEN + * .. SSCALTEST .. + CALL SSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX) |