1
1

Add Libtool patch to autogen.pl for Sun Studio Fortran linker options

This commit was SVN r24075.
Этот коммит содержится в:
Ethan Mallove 2010-11-19 22:09:37 +00:00
родитель 1d62542c23
Коммит ea837b9201
3 изменённых файлов: 48 добавлений и 0 удалений

Просмотреть файл

@ -1,6 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# #
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -1117,6 +1118,10 @@ close(OUT);
safe_system("cp configure.patched configure"); safe_system("cp configure.patched configure");
unlink("configure.patched"); unlink("configure.patched");
# Patch libtool.m4 so that the correct linker options are used in
# all versions of Sun Studio Fortran
verbose "=== Patching Sun Studio Fortran version strings in libtool.m4\n";
system("patch -N -p0 < config/libtool-sun-fortran.diff >/dev/null 2>&1");
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
verbose " verbose "

Просмотреть файл

@ -24,6 +24,7 @@ EXTRA_DIST = \
opal_get_version.m4sh \ opal_get_version.m4sh \
libltdl-preopen-error.diff \ libltdl-preopen-error.diff \
ltmain_pgi_tp.diff \ ltmain_pgi_tp.diff \
libtool-sun-fortran.diff \
ompi_mca_priority_sort.pl ompi_mca_priority_sort.pl
maintainer-clean-local: maintainer-clean-local:

42
config/libtool-sun-fortran.diff Обычный файл
Просмотреть файл

@ -0,0 +1,42 @@
--- config/libtool.m4
+++ config/libtool.m4
@@ -4024,12 +4024,17 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
- *Sun\ F*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
esac
;;
esac
--- opal/libltdl/m4/libtool.m4
+++ opal/libltdl/m4/libtool.m4
@@ -4024,12 +4024,17 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
- *Sun\ F*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
esac
;;
esac