Commit 46d7e443 authored by Kenneth Raffenetti's avatar Kenneth Raffenetti Committed by Halim Amer
Browse files

Revert "Patched libtool for inter-library dependency on FreeBSD."

This reverts commit 7c0f2967

.
Signed-off-by: default avatarHalim Amer <aamer@anl.gov>
parent b1820e55
......@@ -925,12 +925,12 @@ if [ "$do_build_configure" = "yes" ] ; then
# Newer versions should have this patch already included.
if [ -f $amdir/confdb/libtool.m4 ] ; then
# There is no need to patch if we're not going to use Fortran.
libtool_patch_requires_rebuild=no
ifort_patch_requires_rebuild=no
if [ $do_bindings = "yes" ] ; then
echo_n "Patching libtool.m4 for compatibility with ifort on OSX... "
patch -N -s -l $amdir/confdb/libtool.m4 maint/darwin-ifort.patch
if [ $? -eq 0 ] ; then
libtool_patch_requires_rebuild=yes
ifort_patch_requires_rebuild=yes
# Remove possible leftovers, which don't imply a failure
rm -f $amdir/confdb/libtool.m4.orig
echo "done"
......@@ -939,22 +939,7 @@ if [ "$do_build_configure" = "yes" ] ; then
fi
fi
# Set deplibs_check_method to unknown instead of pass_all on FreeBSD.
# Because the inter-library dependency is broken on the latest
# FreeBSD production release (10.1-RELEASE), but libtool cannot detect
# it correctly.
echo_n "Patching libtool.m4 for compatibility with inter-library dependency on FreeBSD... "
patch -N -s -l $amdir/confdb/libtool.m4 maint/freebsd.patch
if [ $? -eq 0 ] ; then
libtool_patch_requires_rebuild=yes
# Remove possible leftovers, which don't imply a failure
rm -f $amdir/confdb/libtool.m4.orig
echo "done"
else
echo "failed"
fi
if [ $libtool_patch_requires_rebuild = "yes" ] ; then
if [ $ifort_patch_requires_rebuild = "yes" ] ; then
# Rebuild configure
(cd $amdir && $autoconf -f) || exit 1
# Reset libtool.m4 timestamps to avoid confusing make
......
--- ../confdb/libtool.m4~ 2015-04-25 09:07:47.000000000 -0500
+++ ../confdb/libtool.m4 2015-04-25 09:08:17.000000000 -0500
@@ -3503,7 +3503,7 @@
;;
esac
else
- lt_cv_deplibs_check_method=pass_all
+ lt_cv_deplibs_check_method=unknown
fi
;;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment