On 2014-03-10 11:59, Erik Joelsson wrote:
Hello,
Please review this simple fix which was also triggered by the
properties files cleanup. On (at least) some Solaris configurations,
sort fails if certain LC_xxx variables are set. The solution is to set
LC_ALL=C instead of LANG=C.
Bug: https://bugs.openjdk.java.net/browse/JDK-8036965
Patch inline:
diff --git a/make/common/JavaCompilation.gmk
b/make/common/JavaCompilation.gmk
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -364,7 +364,7 @@
| $(SED) -e '/^#/d' -e '/^$$$$/d' \
-e :a -e '/\\$$$$/N; s/\\\n//; ta' \
-e 's/^[ \t]*//;s/[ \t]*$$$$//' \
- -e 's/\\=/=/' | LANG=C $(SORT) > $$@
+ -e 's/\\=/=/' | LC_ALL=C $(SORT) > $$@
$(CHMOD) -f ug+w $$@
# And do not forget this target
Looks good to me.
/Magnus