-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| Info2: << | ||
| Package: fftw%type_pkg[-mpi] | ||
| Type: -mpi (boolean), gcc (11) | ||
| Type: -mpi (boolean), gcc (12) | ||
| Version: 2.1.5 | ||
| Revision: 1126 | ||
| Revision: 1127 | ||
| Maintainer: None <[email protected]> | ||
| Source: http://www.fftw.org/fftw-%v.tar.gz | ||
| Source-Checksum: SHA256(f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630) | ||
| BuildDepends: gcc%type_pkg[gcc], fink (>= 0.27.2) | ||
| BuildDepends: gcc%type_pkg[gcc]-compiler, fink (>= 0.27.2) | ||
| BuildConflicts: (%type_raw[-mpi] = .) openmpi, lammpi-dev | ||
| Depends: %N-shlibs (= %v-%r), gcc%type_pkg[gcc]-shlibs, (%type_raw[-mpi] = -mpi) openmpi, (%type_raw[-mpi] = -mpi) openmpi-shlibs | ||
| BuildDependsOnly: True | ||
|
|
@@ -26,7 +26,7 @@ ConfigureParams: << | |
| --infodir=%p/share/info \ | ||
| --without-gcc-arch \ | ||
| (%type_raw[-mpi] = -mpi) --enable-mpi \ | ||
| F77=%p/bin/gfortran \ | ||
| F77=%p/bin/gfortran-fsf-%type_raw[gcc] \ | ||
| FLIBS="-L%p/lib/gcc%type_raw[gcc]/lib -lgfortran" \ | ||
| FFLAGS=-O3 | ||
| << | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| Info2: << | ||
| Package: fftw3 | ||
| Version: 3.3.10 | ||
| Revision: 3 | ||
| Revision: 4 | ||
| Maintainer: None <[email protected]> | ||
|
|
||
| Type: gcc (11) | ||
| Type: gcc (12) | ||
|
|
||
| Source: https://www.fftw.org/fftw-%v.tar.gz | ||
| Source-Checksum: SHA256(56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467) | ||
|
|
||
0302bcbThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As a result of this change, I've just tried building GCC12 on MacOS 13.6 (on Intel / x86_64). And it failed with a lot of errors in the sanitizer library - presumably a result of (gcc-mirror/gcc@1df7237). There is a bunch of work in #1033 to support this in GCC11 on Apple Silicon (I haven't tried these patches) - see also #1073. But I haven't seen any patches here for GCC12 yet? Might be worth prioritising if dependencies are being bumped up to GCC12.
0302bcbThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't got any feedback yet on treatment of the libsanitizer build in #1033 (which is responsible for the failure on 13.6), or if the Homebrew paches still require BDep on fink
patch, but have pushed my packages for gcc12 and gcc13 with the equivalent changes now to #1080 for review.