[patch] patch, not for production!! this is only for testing on x86

javacup-11_p20160615-r1.patch (text/plain), 1.60 KB, created by Volkmar W. Pogatzki on 2024-07-20 10:42:37 UTC

diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615-r1.ebuild
similarity index 91%
rename from dev-java/javacup/javacup-11b_p20160615.ebuild
rename to dev-java/javacup/javacup-11b_p20160615-r1.ebuild
index cc3c6e0d7637..b076e70afec1 100644
--- a/dev-java/javacup/javacup-11b_p20160615.ebuild
+++ b/dev-java/javacup/javacup-11b_p20160615-r1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-ma
 IUSE="ant-task"
 
 DEPEND="${CP_DEPEND}
-	>=dev-java/jflex-1.6.1-r3:0
 	>=virtual/jdk-1.8:*
 	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
 RDEPEND="${CP_DEPEND}
@@ -50,7 +49,8 @@ src_compile() {
 	einfo "Path to JAVACUP is ${CP_CUP}"
 
 	einfo "Get path to jflex"
-	CP_FLEX="$(java-pkg_getjars --build-only jflex)"
+	# CP_FLEX="$(java-pkg_getjars --build-only jflex)"
+	CP_FLEX="$(echo bin/JFlex.jar)"
 	einfo "Path to jflex is ${CP_FLEX}"
 
 	einfo "Generate parser with: ${CP_CUP}"
@@ -60,7 +60,7 @@ src_compile() {
 
 	einfo "Generate lexer"
 	# https://jflex.de/manual.html#running-jflex
-	$(java-config -J) -cp "${CP_CUP}:${CP_FLEX}" jflex.Main \
+	$(java-config -J) -cp "${CP_CUP}:${CP_FLEX}" JFlex.Main \
 		flex/Lexer.jflex -d java/javacup || die
 
 	einfo "Build intermediate jar"
@@ -76,7 +76,7 @@ src_compile() {
 		cup/parser.cup || die
 
 	einfo "Regenerate lexer with intermediate jar file"
-	$(java-config -J) -cp "$(echo ./seco.jar):${CP_FLEX}" jflex.Main \
+	$(java-config -J) -cp "$(echo ./seco.jar):${CP_FLEX}" JFlex.Main \
 		flex/Lexer.jflex -d java/javacup || die
 
 	einfo "Build final jar with regenerated parser and lexer"