From 849555ef99170b02151eb72cf14d0ce7e0cc5a22 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Wed, 10 Jun 2015 16:37:42 -0500 Subject: [svn-r27189] Merge change from hdf5_1_8_15 to hdf5_1_8. Chane addressed HDFFV-9010: configure issue with gcc 4.9.2; libtool produced "-l " with no lib name. Also Scot noted that the -i option for sed does not work on Solaris or Mac, so the sed output is written to a temp file and then moved to the libtool file Tested h5committest. --- configure | 9 +++++++++ configure.ac | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/configure b/configure index 06a933e..b63c951 100755 --- a/configure +++ b/configure @@ -33393,5 +33393,14 @@ cat >> src/H5config.h <, specifically gfortran or m. +## This sed script corrects "-l " first and then "-l " with no library name. +## If the order is not preserved, all instances of "-l " will be removed. +## The -i option for sed doesn't work on some systems, so a temporary file is used +## and used to overwrite the original libtool file. +sed -e '/^postdeps/ s/-l \(a-zA-Z\)/-l\1/g' -e '/^postdeps/ s/-l //g' libtool > libtool_rev +mv -f libtool_rev libtool + ## show the configure settings cat src/libhdf5.settings diff --git a/configure.ac b/configure.ac index ccf5dc5..e1fee46 100644 --- a/configure.ac +++ b/configure.ac @@ -3116,5 +3116,14 @@ cat >> src/H5config.h <, specifically gfortran or m. +## This sed script corrects "-l " first and then "-l " with no library name. +## If the order is not preserved, all instances of "-l " will be removed. +## The -i option for sed doesn't work on some systems, so a temporary file is used +## and used to overwrite the original libtool file. +sed -e '/^postdeps/ s/-l \([a-zA-Z]\)/-l\1/g' -e '/^postdeps/ s/-l //g' libtool > libtool_rev +mv -f libtool_rev libtool + ## show the configure settings cat src/libhdf5.settings -- cgit v0.12