From: Ralf Wildenhues Date: Tue, 24 Nov 2009 14:22:57 +0000 (+0100) Subject: Tighten regex for Portland C++ compiler for version 10. X-Git-Tag: v2.2.7b~45 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=79dc9e9c8af44bcedb576807bc42e178940a52fd;p=thirdparty%2Flibtool.git Tighten regex for Portland C++ compiler for version 10. * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG) [linux]: Match a dot after version 1 through 5, so 10 and up don't match, and use weak symbols. * THANKS: Update. Report by Jeff Squyres and Brent Leback. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 80c692d25..7b84f9137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-11-24 Ralf Wildenhues + + Tighten regex for Portland C++ compiler for version 10. + * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG) [linux]: + Match a dot after version 1 through 5, so 10 and up don't match, + and use weak symbols. + * THANKS: Update. + Report by Jeff Squyres and Brent Leback. + 2009-11-16 Peter O'Gorman Update libltdl version to match 2.2.6b release. diff --git a/THANKS b/THANKS index 691017d1e..004dbd877 100644 --- a/THANKS +++ b/THANKS @@ -74,6 +74,7 @@ Andrey Slepuhin pooh@msu.ru Aneesh Kumar K.V kvaneesh@hotmail.com Brad Smith brad@comstyle.com + Brent Leback brent.leback@st.com Brian Barrett brbarret@osl.iu.edu Bruno Haible haible@ilog.fr Camilo La Rota camilo.larota@ens-lyon.fr diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 1f58a38ca..65dd0274e 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -5993,7 +5993,7 @@ if test "$_lt_caught_CXX_error" != yes; then pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -6012,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;;