Skip to content

Commit

Permalink
Fix/revert a libtool sed hack (HDFGroup#4501)
Browse files Browse the repository at this point in the history
* Revert "Remove Autotools sed hack (HDFGroup#3848)"

This reverts commit 8b3ffde.

* Fix libtool sed cleanup on MacOS

Convert sed -i line to sed > libtool.bak && mv libtool.bak libtool
to avoid non-portable -i option.
  • Loading branch information
derobins authored and lrknox committed May 20, 2024
1 parent e441451 commit 6946ad9
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 10 deletions.
7 changes: 7 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4609,5 +4609,12 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
esac
fi

## HDF5 configure code created by autotools with gcc 4.9.2 is adding problematic
## linker flags: -l with no library name; -l <libname>, specifically gfortran or m.
## This sed script corrects "-l <libname>" first and then "-l " with no library name.
## If the order is not preserved, all instances of "-l " will be removed.
sed -e '/^postdeps/ s/-l \([a-zA-Z]\)/-l\1/g' -e '/^postdeps/ s/-l //g' libtool > libtool.bak
mv -- libtool.bak libtool

## show the configure settings
cat src/libhdf5.settings
26 changes: 16 additions & 10 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,22 @@ Bug Fixes since HDF5-1.14.4 release

Configuration
-------------
- Fixed/reverted an Autotools configure hack that causes problems on MacOS

A sed line in configure.ac was added in the past to paper over some
problems with older versions of the Autotools that would add incorrect
linker flags. This used the -i option in a way that caused silent
errors on MacOS that did not break the build.

The original fix for this problem (in 1.14.4) removed the sed line
entirely, but it turns out that the sed cleanup is still necessary
on some systems, where empty -l options will be added to the libtool
script.

This sed line has been restored and reworked to not use -i.

Fixes GitHub issues #3843 and #4448

- Fixed a list index out of range issue in the runTest.cmake file

Fixed an issue in config/cmake/runTest.cmake where the CMake logic
Expand Down Expand Up @@ -1063,16 +1079,6 @@ Bug Fixes since HDF5-1.14.4 release
* HDF5_ENABLE_DOXY_WARNINGS: ON/OFF (Default: OFF)
* --enable-doxygen-errors: enable/disable (Default: disable)

- Removed an Autotools configure hack that causes problems on MacOS

A sed line in configure.ac was added in the past to paper over some
problems with older versions of the Autotools that would add incorrect
linker flags. This hack is not needed with recent versions of the
Autotools and the sed line errors on MacOS (though this was a silent
error that didn't break the build) so the hack has been removed.

Fixes GitHub issue #3843

- Fixed an issue where the h5tools_test_utils test program was being
installed on the system for Autotools builds of HDF5

Expand Down

0 comments on commit 6946ad9

Please sign in to comment.