v4.0.x: Fortran fixes #7360
Merged
v4.0.x: Fortran fixes #7360
Conversation
This file contains hidden or 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
These -D's are for C compilation, not Fortran compilation. Remove this useless statement. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit f4a47a5)
Automake's Fortran compilation rules inexplicably use CPPFLAGS and AM_CPPFLAGS. Unfortunately, this can cause problems in some cases (e.g., picking up already-installed mpi.mod in a system-default include search path). So in relevant module-using Fortran compilation Makefile.am's, zero out CPPFLAGS and AM_CPPFLAGS. This has a side-effect of requiring that we compile the one .c file in the F08 library in a new, separate subdirectory (with its own Makefile.am that does _not_ have CPPFLAGS/AM_CPPFLAGS zeroed out). Signed-off-by: Jeff Squyres <[email protected]> Signed-off-by: Gilles Gouaillardet <[email protected]> (cherry picked from commit ab398f4)
|
@jeffhammond @marmistrz Can you guys try out this PR? It's a port from master, but master has diverged a bit from the v4.0.x Fortran support -- it would be helpful if you guys could test this one and see if it fixes the problem correctly on the v4.0.x branch. Thanks! |
|
This also builds without error. |
|
@gpaulsen @hppritcha This one is all ready to go, if you're still accepting things for v4.0.3. It just needs a review. I'm guessing @ggouaillardet is busy these days... |
hppritcha
approved these changes
Feb 9, 2020
ggouaillardet
added a commit
to ggouaillardet/ompi
that referenced
this pull request
Apr 14, 2020
An incorrect backport in open-mpi#7360 removed constants.c from ompi/mpi/fortran/use-mpi-f08/base/Makefile.am This one off commit fixes that, and move constants.h from ompi/mpi/fortran/use-mpi-f08 to ompi/mpi/fortran/use-mpi-f08/base Fixes open-mpi#7616 Signed-off-by: Gilles Gouaillardet <[email protected]>
cniethammer
pushed a commit
to cniethammer/ompi
that referenced
this pull request
May 10, 2020
An incorrect backport in open-mpi#7360 removed constants.c from ompi/mpi/fortran/use-mpi-f08/base/Makefile.am This one off commit fixes that, and move constants.h from ompi/mpi/fortran/use-mpi-f08 to ompi/mpi/fortran/use-mpi-f08/base Fixes open-mpi#7616 Signed-off-by: Gilles Gouaillardet <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a cherry pick of PR #7265 to the v4.0.x branch.
See the individual commit messages for details.
Unfortunately, right before #7265 was merged, a 3rd commit was squashed incorrectly: one of the two remaining commits has a few hunks that really should have been squashed in to the other commit. Doh.
Refs #7253