From: Ralf Wildenhues Date: Mon, 31 Jan 2005 17:31:30 +0000 (+0000) Subject: * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Unicos 9 sed rejects X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a544105c3a881f725e02d941e0b91030c51e837;p=thirdparty%2Flibtool.git * 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). --- diff --git a/ChangeLog b/ChangeLog index 332df9f24..2146b1085 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 b1b3270eb..8b823876d 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2769,9 +2769,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*) @@ -2824,8 +2821,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 @@ -3427,6 +3427,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 5b6ebd661..a296c659f 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