summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-11-02 23:24:17 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-11-02 23:40:57 +0000
commit35c081c398a95b522be2ae83ce52616fa6517aed (patch)
treec6b6aa30b83d62a33f3324e0017e6889a9b33939 /dev-java/jflex/files
parentdev-lang/php: revbump php-5.6.15 to fix a segfault. (diff)
downloadgentoo-35c081c398a95b522be2ae83ce52616fa6517aed.tar.gz
gentoo-35c081c398a95b522be2ae83ce52616fa6517aed.tar.bz2
gentoo-35c081c398a95b522be2ae83ce52616fa6517aed.zip
dev-java/jflex: Rewrite for version bump to 1.6.1
Rewritten using java-pkg-simple to give us more control over this tricky package. javacup has become a PDEPEND, meaning that the bundled version is automatically used on the first build instead of it having a system-jflex USE flag. ~arm keyword added with workarounds for different problems encountered with both IcedTea and Oracle. ~ppc64 keyword temporarily dropped until it gets Java 7, which the newer javacup requires. Please stabilise this at the same time as dev-java/qdox-1.12.1-r1. Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-java/jflex/files')
-rw-r--r--dev-java/jflex/files/icedtea-arm.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/dev-java/jflex/files/icedtea-arm.patch b/dev-java/jflex/files/icedtea-arm.patch
new file mode 100644
index 000000000000..acefd9b553e2
--- /dev/null
+++ b/dev-java/jflex/files/icedtea-arm.patch
@@ -0,0 +1,18 @@
+http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678
+
+diff -Naur jflex-1.6.1.orig/src/main/java/jflex/Emitter.java jflex-1.6.1/src/main/java/jflex/Emitter.java
+--- jflex-1.6.1.orig/src/main/java/jflex/Emitter.java 2015-03-16 17:27:31.000000000 +0000
++++ jflex-1.6.1/src/main/java/jflex/Emitter.java 2015-10-25 23:33:35.784487747 +0000
+@@ -1304,8 +1304,10 @@
+
+ for (int i = 0; i < dfa.numStates; i++) {
+ char j = 0;
+- while ( !isTransition[i] && j < dfa.numInput )
+- isTransition[i] = dfa.table[i][j++] != DFA.NO_TARGET;
++ while ( !isTransition[i] && j < dfa.numInput ) {
++ isTransition[i] = dfa.table[i][j] != DFA.NO_TARGET;
++ j++;
++ }
+ }
+ }
+