OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port to hosts whose 'sort' and 'tail' implementations treat operands with leading '+' as file names...

Browse Source 
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
This commit is contained in:
Paul Eggert 2006-07-07 21:20:12 +00:00 committed by Mike Stump
parent 5548b68809
commit f03a019108
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/classpath/ChangeLog
View File

@ -1,3 +1,15 @@
2006-07-06 Paul Eggert <eggert@cs.ucla.edu>
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 <peter@pogma.com>
* ltconfig: chmod 644 before ranlib during install.

8
libjava/classpath/ltmain.sh
View File

@ -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 >/dev/null 2>&1; then
sort -k 3
else
sort +2
fi |
uniq > "$nlist"S; then
:
else
grep -v "^: " < "$nlist" > "$nlist"S