diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-10-27 04:38:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-10-27 04:38:32 +0000 |
| commit | b72e78ea3fbff3f430201cc60c5462771bd39dec (patch) | |
| tree | 0cb9cfd0ac21ca93081bb92edfb202d9c6b6b869 /4.6.4 | |
| parent | use my real name (diff) | |
| download | gcc-patches-b72e78ea3fbff3f430201cc60c5462771bd39dec.tar.gz gcc-patches-b72e78ea3fbff3f430201cc60c5462771bd39dec.tar.bz2 gcc-patches-b72e78ea3fbff3f430201cc60c5462771bd39dec.zip | |
add fix from upstream for checking JNI headers in some locales #563710 by Miroslav Šulc
Diffstat (limited to '4.6.4')
| -rw-r--r-- | 4.6.4/gentoo/34_all_libjava-classpath-locale-sort.patch | 57 | ||||
| -rw-r--r-- | 4.6.4/gentoo/README.history | 3 |
2 files changed, 60 insertions, 0 deletions
diff --git a/4.6.4/gentoo/34_all_libjava-classpath-locale-sort.patch b/4.6.4/gentoo/34_all_libjava-classpath-locale-sort.patch new file mode 100644 index 0000000..0870939 --- /dev/null +++ b/4.6.4/gentoo/34_all_libjava-classpath-locale-sort.patch @@ -0,0 +1,57 @@ +From 3a52cf750bd9da06cffa7d642f1e74e77bfd8a8c Mon Sep 17 00:00:00 2001 +From: vapier <vapier@138bc75d-0d04-0410-961f-82ee72b054a4> +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=UTF-8 +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 <fordfrog@gentoo.org> + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229388 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + 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/scripts/check_jni_methods.sh.in b/libjava/classpath/scripts/check_jni_methods.sh.in +index facf34b..fb9d104 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.5.2 + diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history index 39ed8b2..36623c3 100644 --- a/4.6.4/gentoo/README.history +++ b/4.6.4/gentoo/README.history @@ -1,3 +1,6 @@ +1.4 [pending] + + 34_all_libjava-classpath-locale-sort.patch + 1.3 27 May 2015 + 45_all_linux-pthread-reentrant.patch - 74_all_gcc46_cloog-dl.patch |