From 96f3dd0a661a222f0add68a508a1307e3d619157 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Oct 2015 18:32:41 +0000 Subject: [PATCH] libjava: fix locale handling when sorting JNI methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 From-SVN: r229388 --- libjava/classpath/ChangeLog | 5 +++++ libjava/classpath/scripts/check_jni_methods.sh.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 34dac3851a4..fa49ad59bed 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,8 @@ +2015-10-26 Mike Frysinger + + * scripts/check_jni_methods.sh.in: Run sort with LC_ALL=C, and + combine `sort|uniq` into `sort -u`. + 2015-08-11 Uros Bizjak * configure.ac (tools/gjdoc): Depend on CREATE_WRAPPERS. diff --git a/libjava/classpath/scripts/check_jni_methods.sh.in b/libjava/classpath/scripts/check_jni_methods.sh.in index facf34b345b..fb9d104e3d0 100644 --- a/libjava/classpath/scripts/check_jni_methods.sh.in +++ b/libjava/classpath/scripts/check_jni_methods.sh.in @@ -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. -- 2.30.2