Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 207319 Details for
Bug 289119
dev-java/gjdoc-0.7.9-r1 doesn't build against antl-3.1.3-r2 or any antlr newer than 2.x
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
files/antlr-ver-fix.patch - Touches quite a lot of files.
antlr-ver-fix.patch (text/plain), 7.99 KB, created by
Rebecca Menessec
on 2009-10-16 15:36:12 UTC
(
hide
)
Description:
files/antlr-ver-fix.patch - Touches quite a lot of files.
Filename:
MIME Type:
Creator:
Rebecca Menessec
Created:
2009-10-16 15:36:12 UTC
Size:
7.99 KB
patch
obsolete
>diff -urNp gjdoc-0.7.9/ChangeLog gjdoc-0.7.9-r2/ChangeLog >--- gjdoc-0.7.9/ChangeLog 2008-04-21 17:07:18.000000000 -0400 >+++ gjdoc-0.7.9-r2/ChangeLog 2009-10-14 13:54:56.000000000 -0400 >@@ -568,8 +568,8 @@ > > 2005-05-19 Julian Scheid <julian@sektor37.de> > >- * m4/ac_prog_antlr.m4: Look for antlr.jar in /usr/share/antlr/lib >- as well. This is where antlr.jar is located on Gentoo. See >+ * m4/ac_prog_antlr.m4: Look for antlr3.jar in /usr/share/antlr/lib >+ as well. This is where antlr3.jar is located on Gentoo. See > Savannah bug #12977. > > 2005-05-18 Julian Scheid <julian@sektor37.de> >@@ -860,7 +860,7 @@ > > 2005-02-18 Julian Scheid <julian@sektor37.de> > >- * gjdoc.sh.in: Add antlr.jar to classpath. >+ * gjdoc.sh.in: Add antlr3.jar to classpath. > > 2005-02-18 Julian Scheid <julian@sektor37.de> > >@@ -1006,7 +1006,7 @@ > 2005-02-09 Julian Scheid <julian@sektor37.de> > > * Makefile.am: correct jar parameters to fix "file not found" >- error with Kaffe's jar tool; do not copy antlr.jar to build >+ error with Kaffe's jar tool; do not copy antlr3.jar to build > directory; minor syntax fixes; fix dependency issues; do not > generate version.properties and gjdoc.mf. > >@@ -1022,7 +1022,7 @@ > Kaffe's jar. > > * m4/ac_prog_antlr.m4: if $ANTLR_JAR is set, use that for locating >- antlr.jar; complain if $ANTLR_JAR specifies a non-existing file. >+ antlr3.jar; complain if $ANTLR_JAR specifies a non-existing file. > > * configure.ac: set autoconf prerequisite version to 2.59; set > config macro directory; accept option --with-antlr-jar. >@@ -1349,7 +1349,7 @@ > 2004-12-21 Julian Scheid <julian@sektor37.de> > > * acinclude.m4: remove dependency on grep supporting -o; do not >- complain if no antlr.jar is found. >+ complain if no antlr3.jar is found. > > 2004-12-21 Julian Scheid <julian@sektor37.de> > >diff -urNp gjdoc-0.7.9/configure gjdoc-0.7.9-r2/configure >--- gjdoc-0.7.9/configure 2008-04-21 17:27:55.000000000 -0400 >+++ gjdoc-0.7.9-r2/configure 2009-10-14 15:17:34.000000000 -0400 >@@ -717,7 +717,7 @@ ac_hostname=`(hostname || uname -n) 2>/d > # > # Initializations. > # >-ac_default_prefix=/usr/local >+ac_default_prefix=/usr > ac_clean_files= > ac_config_libobj_dir=. > LIBOBJS= >@@ -20752,10 +20752,10 @@ bytecode. > > > if test -z "$ANTLR_JAR"; then >- { echo "$as_me:$LINENO: checking for antlr 2.7.1 or better" >&5 >-echo $ECHO_N "checking for antlr 2.7.1 or better... $ECHO_C" >&6; } >- for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` /usr/share/antlr/lib /usr/share/java /usr/lib; do >- antlr_version_str=`$JAVA -classpath "$antlr_lib_home/antlr.jar" antlr.Tool 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` >+ { echo "$as_me:$LINENO: checking for antlr 3.1.3 or better" >&5 >+echo $ECHO_N "checking for antlr 3.1.3 or better... $ECHO_C" >&6; } >+ for antlr_lib_home in `ls -d /usr/share/antlr* 2> /dev/null` /usr/share/antlr/lib /usr/share/java /usr/lib; do >+ antlr_version_str=`$JAVA -classpath "$antlr_lib_home/antlr3.jar" antlr.Tool 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` > if test "$antlr_version_str"; then > antlr_version_regex='s/\([[:digit:]]\+\)\.\([[:digit:]]\+\)\.\([[:digit:]]\+\).*$/' > antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` >@@ -20775,7 +20775,7 @@ echo $ECHO_N "checking for antlr 2.7.1 o > (test $antlr_version_major -eq $antlr_use_major && \ > test $antlr_version_minor -eq $antlr_use_minor && \ > test $antlr_version_micro -ge $antlr_use_micro))) && \ >- ANTLR_JAR=$antlr_lib_home/antlr.jar && \ >+ ANTLR_JAR=$antlr_lib_home/antlr3.jar && \ > antlr_use_major=$antlr_version_major && \ > antlr_use_minor=$antlr_version_minor && \ > antlr_use_micro=$antlr_version_micro >@@ -20790,8 +20790,8 @@ echo "$as_me: using ANTLR parser generat > fi > ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool" > test -z $ANTLR_JAR && \ >- { { echo "$as_me:$LINENO: error: no suitable antlr.jar found for version 2.7.1" >&5 >-echo "$as_me: error: no suitable antlr.jar found for version 2.7.1" >&2;} >+ { { echo "$as_me:$LINENO: error: no suitable antlr3.jar found for version 3.1.3" >&5 >+echo "$as_me: error: no suitable antlr3.jar found for version 3.1.3" >&2;} > { (exit 1); exit 1; }; } > { echo "$as_me:$LINENO: result: $antlr_use_major.$antlr_use_minor.$antlr_use_micro" >&5 > echo "${ECHO_T}$antlr_use_major.$antlr_use_minor.$antlr_use_micro" >&6; } >diff -urNp gjdoc-0.7.9/m4/ac_prog_antlr.m4 gjdoc-0.7.9-r2/m4/ac_prog_antlr.m4 >--- gjdoc-0.7.9/m4/ac_prog_antlr.m4 2005-05-19 06:28:33.000000000 -0400 >+++ gjdoc-0.7.9-r2/m4/ac_prog_antlr.m4 2009-10-14 13:54:56.000000000 -0400 >@@ -4,7 +4,7 @@ AC_DEFUN([AC_PROG_ANTLR],[ > AC_REQUIRE([AC_PROG_JAVA])dnl > AC_MSG_CHECKING([for antlr $1.$2.$3 or better]) > for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` /usr/share/antlr/lib /usr/share/java /usr/lib; do >- antlr_version_str=`$JAVA -classpath "$antlr_lib_home/antlr.jar" antlr.Tool 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` >+ antlr_version_str=`$JAVA -classpath "$antlr_lib_home/antlr3.jar" antlr.Tool 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` > if test "$antlr_version_str"; then > antlr_version_regex='s/\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\).*$/' > antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` >@@ -24,7 +24,7 @@ AC_DEFUN([AC_PROG_ANTLR],[ > (test $antlr_version_major -eq $antlr_use_major && \ > test $antlr_version_minor -eq $antlr_use_minor && \ > test $antlr_version_micro -ge $antlr_use_micro))) && \ >- ANTLR_JAR=$antlr_lib_home/antlr.jar && \ >+ ANTLR_JAR=$antlr_lib_home/antlr3.jar && \ > antlr_use_major=$antlr_version_major && \ > antlr_use_minor=$antlr_version_minor && \ > antlr_use_micro=$antlr_version_micro >@@ -36,7 +36,7 @@ AC_DEFUN([AC_PROG_ANTLR],[ > fi > ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool" > test -z $ANTLR_JAR && \ >- AC_MSG_ERROR(no suitable antlr.jar found for version $1.$2.$3) >+ AC_MSG_ERROR(no suitable antlr3.jar found for version $1.$2.$3) > AC_MSG_RESULT($antlr_use_major.$antlr_use_minor.$antlr_use_micro) > AC_SUBST(ANTLR) > AC_SUBST(ANTLR_JAR) >diff -urNp gjdoc-0.7.9/NEWS gjdoc-0.7.9-r2/NEWS >--- gjdoc-0.7.9/NEWS 2008-04-21 17:07:19.000000000 -0400 >+++ gjdoc-0.7.9-r2/NEWS 2009-10-14 13:54:56.000000000 -0400 >@@ -90,7 +90,7 @@ New in release 0.7.5 > directory, the contents of all package directories are now merged > properly. Thanks to some guy on #classpath for reporting this. > >-* The build is now looking for antlr.jar in /usr/share/antlr/lib. >+* The build is now looking for antlr3.jar in /usr/share/antlr/lib. > This is where it is located on Gentoo. Thanks to David Gilbert for > reporting this. > >@@ -169,14 +169,14 @@ New in release 0.7.1 > * Fixes for several minor build problems, mostly related to jar file > assembly and tool detection. > >-* Bytecode wrapper script now includes antlr.jar on the classpath >+* Bytecode wrapper script now includes antlr3.jar on the classpath > > > New in release 0.7.1-pre3 > > * Add option --with-antlr-jar to configure > >-* Look in /usr/lib for antlr.jar >+* Look in /usr/lib for antlr3.jar > > * Detect gij > >diff -urNp gjdoc-0.7.9/README gjdoc-0.7.9-r2/README >--- gjdoc-0.7.9/README 2005-10-11 20:25:46.000000000 -0400 >+++ gjdoc-0.7.9-r2/README 2009-10-14 13:58:09.000000000 -0400 >@@ -77,7 +77,7 @@ See INSTALL for further details. > > GNU make ("gmake") is required for building gjdoc. > >-You will also need ANTLR 2.7.1 or better installed. See http://antlr.org/. >+You will also need ANTLR 3.1.3 or better installed. See http://antlr.org/. > > When working from CVS you will also need the following tools: > - GNU autoconf 2.59+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 289119
:
207318
| 207319