Commit 80ad7cf8 authored by Antonio J. Pena's avatar Antonio J. Pena Committed by Pavan Balaji
Browse files

Small fix after 8cf54f19 fixing ticket #1870.



Cleaned up spaces-tabs mismatch in patch file, and fixed a few parameters for
the patch command.
Signed-off-by: Pavan Balaji's avatarPavan Balaji <balaji@mcs.anl.gov>
parent 1182a62a
...@@ -919,7 +919,7 @@ if [ $do_bindings = "yes" ] ; then ...@@ -919,7 +919,7 @@ if [ $do_bindings = "yes" ] ; then
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
echo echo
echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... " echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... "
patch --forward -p0 < maint/libtool.m4.patch >/dev/null patch --forward --no-backup-if-mismatch -p0 -s -l < maint/libtool.m4.patch
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
echo "done" echo "done"
else else
......
--- confdb/libtool.m4 2013-03-29 16:26:23.162062517 -0500 --- confdb/libtool.m4 2013-03-29 16:26:23.162062517 -0500
+++ confdb/libtool.m4 2013-06-21 14:22:05.138914413 -0500 +++ confdb/libtool.m4 2013-06-21 14:22:05.138914413 -0500
@@ -4817,6 +4817,8 @@ @@ -4817,6 +4817,8 @@
lf95*) # Lahey Fortran 8.1 lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;; tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3 + nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;; + tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj' tmp_sharedflag='-qmkshrobj'
......
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