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

libjava: fix locale handling when sorting JNI methods

Browse Source 
When building under LANG=cs_CZ.UTF-8, the JNI method check fails:

/bin/bash ../../scripts/check_jni_methods.sh
Found a problem with the JNI methods declared and implemented.
(<) missing in implementation, (>) missing in header files
> Java_gnu_java_awt_peer_gtk_GtkClipboard_advertiseContent
> Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState
... lots more ...

While the sed commands are run under LC_ALL=C, the two sort commands are
not, and they end up producing unexpected output (for the test).  Once we
run both under LC_ALL=C, the check passes.  While we're here, we can also
combine latter the `sort|uniq` into `sort -u` to match the earlier code.

URL: https://bugs.gentoo.org/563710
Reported-by: Miroslav Šulc <fordfrog@gentoo.org>

From-SVN: r229388
This commit is contained in:
Mike Frysinger 2015-10-26 18:32:41 +00:00 committed by Mike Frysinger
parent 15c918bc76
commit 96f3dd0a66
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/classpath/ChangeLog
View File

@ -1,3 +1,8 @@
2015-10-26 Mike Frysinger <vapier@gentoo.org>
* scripts/check_jni_methods.sh.in: Run sort with LC_ALL=C, and
combine `sort|uniq` into `sort -u`.
2015-08-11 Uros Bizjak <ubizjak@gmail.com>
* configure.ac (tools/gjdoc): Depend on CREATE_WRAPPERS.

4
libjava/classpath/scripts/check_jni_methods.sh.in
View File

@ -14,7 +14,7 @@ grep -h '^JNIEXPORT .* Java_' @abs_top_srcdir@/include/*.h | \
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' > $TMPFILE
grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE
sort -u $TMPFILE > $TMPFILE4
LC_ALL=C sort -u $TMPFILE > $TMPFILE4
mv $TMPFILE4 $TMPFILE
# Find all methods in the JNI C source files.
@ -31,7 +31,7 @@ find @abs_top_srcdir@/native/jni -name \*.cpp | \
cut -f4 -d\ | \
LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2
mv $TMPFILE2 $TMPFILE3
sort $TMPFILE3 | uniq > $TMPFILE2
LC_ALL=C sort -u $TMPFILE3 > $TMPFILE2
rm $TMPFILE3
# Write temporary ignore file.