From 29b611694e1f91438fa330714e7fdeb2b6ce4baf Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Mon, 31 Mar 2008 17:19:06 -0700
Subject: [PATCH] 6482445: j2se/make/java/java/localegen.sh uses 'sort' from
 PATH, could get system32/sort Summary: Making sure the right 'sort' utility
 is found. Reviewed-by: tbell

---
 make/java/java/genlocales.gmk | 3 ++-
 make/java/java/localegen.sh   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/make/java/java/genlocales.gmk b/make/java/java/genlocales.gmk
index 05ad9f36d..8ea0a0f25 100644
--- a/make/java/java/genlocales.gmk
+++ b/make/java/java/genlocales.gmk
@@ -80,7 +80,8 @@ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
 	@$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro;	
 	@$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro;
 	@$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro;
-	NAWK=$(NAWK) SED=$(SED) $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
+	NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
+	     $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
 		$@.tmp.noneuro $< $@
 	@$(RM) $@.tmp.euro $@.tmp.noneuro;
 	
diff --git a/make/java/java/localegen.sh b/make/java/java/localegen.sh
index 70e26838b..b4506b978 100644
--- a/make/java/java/localegen.sh
+++ b/make/java/java/localegen.sh
@@ -29,7 +29,7 @@
 # This script is to generate the supported locale list string and replace the
 # LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
 # 
-# NAWK & SED is passed in as environment variables.
+# SORT, NAWK & SED is passed in as environment variables.
 #
 
 # A list of resource base name list;
@@ -47,7 +47,7 @@ OUTPUT_FILE=$5
 localelist=
 getlocalelist() {
     localelist=""
-    localelist=`$NAWK -F$1_ '{print $2}' $2 | sort`
+    localelist=`$NAWK -F$1_ '{print $2}' $2 | $SORT`
 }
 
 sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" " 
-- 
GitLab