From 62fae08f5775642aa2446521b130c97e292fb4c0 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 31 Jan 2005 17:30:47 +0000 Subject: [PATCH] * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Unicos 9 sed rejects empty parentheses as in 's/x()/1/'. (_LT_COMPILER_PIC) [unicos*]: wl=-Wl,. * tests/sh.test: Not all sed's like '/.*n.*/' (Unicos 9 sed loops endlessly). --- ChangeLog | 6 ++++++ m4/libtool.m4 | 13 +++++++++---- tests/sh.test | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98b10dac..d566aa9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-01-31 Ralf Wildenhues + * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Unicos 9 sed rejects + empty parentheses as in 's/x\(\)/\1/'. + (_LT_COMPILER_PIC) [unicos*]: wl=-Wl,. + * tests/sh.test: Not all sed's like '/.*\n.*/' (Unicos 9 sed + loops endlessly). + * tests/quote.test: Match link quoting against `"$wl"', not `-Wl,'. * tests/quote.test: Check for `--no-reexec' in $1 to avoid one reexec. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 8ba97e17..74a229fe 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2775,9 +2775,6 @@ symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Define system-specific variables. case $host_os in aix*) @@ -2830,8 +2827,11 @@ esac # Try without a prefix underscore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -3433,6 +3433,11 @@ m4_if([$1], [CXX], [ fi ;; + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + uts4*) _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' diff --git a/tests/sh.test b/tests/sh.test index 5b6ebd66..a296c659 100755 --- a/tests/sh.test +++ b/tests/sh.test @@ -84,7 +84,7 @@ fi # Check for using shift after set dummy (same or following line). for s in $scripts do - if $SED -n '/set[ ][ ]*dummy/{/set.*dummy.*;.*shift/d;N;/set.*dummy.*\n.*shift/D;p;}' "$s" | + if $SED -n '/set[ ][ ]*dummy/{/set.*dummy.*;.*shift/d;N;/\n.*shift/D;p;}' "$s" | $EGREP .; then echo "use \`shift' after \`set dummy' in $s" status=$EXIT_FAILURE