From f03a01910822bb92dcbf3cfcaf36328f4b92d1ff Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 7 Jul 2006 21:20:12 +0000 Subject: Port to hosts whose 'sort' and 'tail' implementations treat operands with leading '+' as file names... Port to hosts whose 'sort' and 'tail' implementations treat operands with leading '+' as file names, as POSIX has required since 2001. However, make sure the code still works on pre-POSIX hosts. * libjava/classpath/ltmain.sh: Don't assume "sort +2" is equivalent to "sort -k 3", since POSIX 1003.1-2001 no longer requires this. This uses the same fix that is already in libjava/libltdl/ltmain.sh. From-SVN: r115271 --- libjava/classpath/ChangeLog | 12 ++++++++++++ libjava/classpath/ltmain.sh | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 82e756b..4e401a4 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,15 @@ +2006-07-06 Paul Eggert + + Port to hosts whose 'sort' and 'tail' implementations + treat operands with leading '+' as file names, as POSIX + has required since 2001. However, make sure the code still + works on pre-POSIX hosts. + * libjava/classpath/ltmain.sh: Don't assume "sort +2" is + equivalent to "sort -k 3", since POSIX 1003.1-2001 no longer + requires this. + This uses the same fix that is already in + libjava/libltdl/ltmain.sh. + 2006-07-04 Peter O'Gorman * ltconfig: chmod 644 before ranlib during install. diff --git a/libjava/classpath/ltmain.sh b/libjava/classpath/ltmain.sh index 219823f..a3c55f9 100644 --- a/libjava/classpath/ltmain.sh +++ b/libjava/classpath/ltmain.sh @@ -3839,7 +3839,13 @@ extern \"C\" { fi # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then + if grep -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S -- cgit v1.1