-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Build HDF5 1.14.0 for mingw-w64 #15033
Merged
+60
−134
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
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
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
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
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
10 changes: 10 additions & 0 deletions
10
mingw-w64-hdf5/hdf5-fix-fortran-module-directory-leak.patch
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 |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- a/CMakeInstallation.cmake 2023-01-20 00:04:12.334144200 -0500 | ||
+++ b/CMakeInstallation.cmake 2023-01-20 00:03:49.497097700 -0500 | ||
@@ -126,6 +126,7 @@ | ||
else () | ||
set (BYTESEX little-endian) | ||
endif () | ||
+set (CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_MODULE_DIR}) | ||
configure_file ( | ||
${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in | ||
${HDF5_SRC_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY |
This file was deleted.
Oops, something went wrong.
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,20 +1,16 @@ | ||
--- hdf5-1.12.0/config/cmake_ext_mod/HDFMacros.cmake.orig 2020-04-26 10:08:44.715403300 +0300 | ||
+++ hdf5-1.12.0/config/cmake_ext_mod/HDFMacros.cmake 2020-04-26 10:34:09.889478600 +0300 | ||
@@ -125,6 +130,8 @@ | ||
--- a/config/cmake/HDFMacros.cmake 2023-01-13 04:34:01.443034400 -0500 | ||
+++ b/config/cmake/HDFMacros.cmake 2023-01-13 04:36:14.419475400 -0500 | ||
@@ -126,10 +126,12 @@ | ||
OUTPUT_NAME_RELEASE ${LIB_RELEASE_NAME} | ||
OUTPUT_NAME_MINSIZEREL ${LIB_RELEASE_NAME} | ||
OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME} | ||
+ RUNTIME_OUTPUT_NAME ${LIB_RELEASE_NAME}-0 | ||
+ ARCHIVE_OUTPUT_NAME ${LIB_RELEASE_NAME} | ||
) | ||
#get_property (target_name TARGET ${libtarget} PROPERTY OUTPUT_NAME) | ||
#get_property (target_name_debug TARGET ${libtarget} PROPERTY OUTPUT_NAME_DEBUG) | ||
@@ -132,7 +139,7 @@ | ||
#message (STATUS "${target_name} : ${target_name_debug} : ${target_name_rwdi}") | ||
|
||
if (${libtype} MATCHES "STATIC") | ||
- if (WIN32) | ||
+ if (MSVC) | ||
set_target_properties (${libtarget} PROPERTIES | ||
COMPILE_PDB_NAME_DEBUG ${LIB_DEBUG_NAME} | ||
COMPILE_PDB_NAME_RELEASE ${LIB_RELEASE_NAME} | ||
COMPILE_PDB_NAME_DEVELOPER ${LIB_DEBUG_NAME} |
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
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
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
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
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
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
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
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
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
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
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
There 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.
These two lines can probably be removed:
RUNTIME_OUTPUT_NAME
can be replaced w/-DCMAKE_SHARED_LIBRARY_NAME_WITH_VERSION=ON
in PKGBUILD, and defaultARCHIVE_OUTPUT_NAME
should be correct already?There 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.
OK, so basically remove the patch and just add the option in PKGBUILD?
There 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.
That's a bit weird... So either we bite the bullet, use the same SOVERSION as other platforms and rebuild, or leave things as is...
Edit: Perhaps it makes sense to leave as is for now, and actually try to address that unnecessary WIN32/MINGW/CYGWIN complexity/misunderstandings upstream first.
There 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.
Btw, the SOVERSION did change between 1.12.2 and 1.14.0, so keeping this artificially at
-0
makes no sense at all. A rebuild is needed anyway.https://github.com/HDFGroup/hdf5/blob/3e847e003632bdd5fdc189ccbffe25ad2661e16f/config/lt_vers.am#L19-L21
https://github.com/HDFGroup/hdf5/blob/0553fb7ac7f03a919c91cdbbd5648b8aadbe05af/config/lt_vers.am#L18-L20
Or don't bump to 1.14 now and wait for 1.12.3 instead...
There 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.
Could we make both 1.14.0 and 1.12.3 available? Are they mutually exclusive?
1.12.3 is the end of the road for 1.12.x by the way, so I think we would want to move to 1.14 immediately.
There 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.
The package grokker only pointed out that
mingw-w64-python-h5py
would need to be rebuilt. (Maybe, that is the only package that uses a function for which the SOVERSION was bumped upstream?)