| 1 |
vapier 15/10/27 04:38:32 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: 34_all_libjava-classpath-locale-sort.patch |
| 5 |
Log: |
| 6 |
add fix from upstream for checking JNI headers in some locales #563710 by Miroslav Šulc |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 src/patchsets/gcc/4.4.7/gentoo/README.history |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.7/gentoo/README.history?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.7/gentoo/README.history?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.7/gentoo/README.history?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: README.history |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.4.7/gentoo/README.history,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- README.history 21 Apr 2013 05:19:17 -0000 1.10 |
| 22 |
+++ README.history 27 Oct 2015 04:38:32 -0000 1.11 |
| 23 |
@@ -1,5 +1,6 @@ |
| 24 |
1.3 [pending] |
| 25 |
+ 18_all_libgcc-cross-canadian.patch |
| 26 |
+ + 34_all_libjava-classpath-locale-sort.patch |
| 27 |
|
| 28 |
1.2 19 Apr 2013 |
| 29 |
+ 30_all_gcc-4.4_arm_armv4-no-thumb-fix-link.patch |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 src/patchsets/gcc/4.4.7/gentoo/34_all_libjava-classpath-locale-sort.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.7/gentoo/34_all_libjava-classpath-locale-sort.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.7/gentoo/34_all_libjava-classpath-locale-sort.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: 34_all_libjava-classpath-locale-sort.patch |
| 39 |
=================================================================== |
| 40 |
From 3a52cf750bd9da06cffa7d642f1e74e77bfd8a8c Mon Sep 17 00:00:00 2001 |
| 41 |
From: vapier <vapier@138bc75d-0d04-0410-961f-82ee72b054a4> |
| 42 |
Date: Mon, 26 Oct 2015 18:32:41 +0000 |
| 43 |
Subject: [PATCH] libjava: fix locale handling when sorting JNI methods |
| 44 |
MIME-Version: 1.0 |
| 45 |
Content-Type: text/plain; charset=UTF-8 |
| 46 |
Content-Transfer-Encoding: 8bit |
| 47 |
|
| 48 |
When building under LANG=cs_CZ.UTF-8, the JNI method check fails: |
| 49 |
|
| 50 |
/bin/bash ../../scripts/check_jni_methods.sh |
| 51 |
Found a problem with the JNI methods declared and implemented. |
| 52 |
(<) missing in implementation, (>) missing in header files |
| 53 |
> Java_gnu_java_awt_peer_gtk_GtkClipboard_advertiseContent |
| 54 |
> Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState |
| 55 |
... lots more ... |
| 56 |
|
| 57 |
While the sed commands are run under LC_ALL=C, the two sort commands are |
| 58 |
not, and they end up producing unexpected output (for the test). Once we |
| 59 |
run both under LC_ALL=C, the check passes. While we're here, we can also |
| 60 |
combine latter the `sort|uniq` into `sort -u` to match the earlier code. |
| 61 |
|
| 62 |
URL: https://bugs.gentoo.org/563710 |
| 63 |
Reported-by: Miroslav Šulc <fordfrog@g.o> |
| 64 |
|
| 65 |
|
| 66 |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229388 138bc75d-0d04-0410-961f-82ee72b054a4 |
| 67 |
--- |
| 68 |
libjava/classpath/ChangeLog | 5 +++++ |
| 69 |
libjava/classpath/scripts/check_jni_methods.sh.in | 4 ++-- |
| 70 |
2 files changed, 7 insertions(+), 2 deletions(-) |
| 71 |
|
| 72 |
diff --git a/libjava/classpath/scripts/check_jni_methods.sh.in b/libjava/classpath/scripts/check_jni_methods.sh.in |
| 73 |
index facf34b..fb9d104 100644 |
| 74 |
--- a/libjava/classpath/scripts/check_jni_methods.sh.in |
| 75 |
+++ b/libjava/classpath/scripts/check_jni_methods.sh.in |
| 76 |
@@ -14,7 +14,7 @@ grep -h '^JNIEXPORT .* Java_' @abs_top_srcdir@/include/*.h | \ |
| 77 |
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' > $TMPFILE |
| 78 |
grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \ |
| 79 |
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE |
| 80 |
-sort -u $TMPFILE > $TMPFILE4 |
| 81 |
+LC_ALL=C sort -u $TMPFILE > $TMPFILE4 |
| 82 |
mv $TMPFILE4 $TMPFILE |
| 83 |
|
| 84 |
# Find all methods in the JNI C source files. |
| 85 |
@@ -31,7 +31,7 @@ find @abs_top_srcdir@/native/jni -name \*.cpp | \ |
| 86 |
cut -f4 -d\ | \ |
| 87 |
LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2 |
| 88 |
mv $TMPFILE2 $TMPFILE3 |
| 89 |
-sort $TMPFILE3 | uniq > $TMPFILE2 |
| 90 |
+LC_ALL=C sort -u $TMPFILE3 > $TMPFILE2 |
| 91 |
rm $TMPFILE3 |
| 92 |
|
| 93 |
# Write temporary ignore file. |
| 94 |
-- |
| 95 |
2.5.2 |
Archives