This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: RFA: enable gcjwebplugin and appletviewer
Andreas Schwab wrote:
Thomas Fitzsimmons <fitzsim@redhat.com> writes:
I committed the attached patch.
Doesn't work:
make[4]: Entering directory `/tmp/cvs/gcc-20060614/Build/ia64-suse-linux/libjava/classpath/tools'
if /tmp/cvs/gcc-20060614/Build/./gcc/xgcc -B/tmp/cvs/gcc-20060614/Build/./gcc/ -B/tmp/cvs/gcc-20060614/Build/root/ia64-suse-linux/bin/ -B/tmp/cvs/gcc-20060614/Build/root/ia64-suse-linux/lib/ -isystem /tmp/cvs/gcc-20060614/Build/root/ia64-suse-linux/include -isystem /tmp/cvs/gcc-20060614/Build/root/ia64-suse-linux/sys-include -DHAVE_CONFIG_H -I. -I../../../../../libjava/classpath/tools -I../include -Wall -DTOOLS_ZIP="\"/tmp/cvs/gcc-20060614/Build/root/share/java/libgcj-tools-4.2.0.jar\"" -DTOOLPACKAGE="\"appletviewer\"" -DTOOLNAME="\"gappletviewer\"" -O2 -O2 -g -MT gappletviewer-toolwrapper.o -MD -MP -MF ".deps/gappletviewer-toolwrapper.Tpo" -c -o gappletviewer-toolwrapper.o `test -f 'toolwrapper.c' || echo '../../../../../libjava/classpath/tools/'`toolwrapper.c; \
then mv -f ".deps/gappletviewer-toolwrapper.Tpo" ".deps/gappletviewer-toolwrapper.Po"; else rm -f ".deps/gappletviewer-toolwrapper.Tpo"; exit 1; fi
../../../../../libjava/classpath/tools/toolwrapper.c:39:17: error: jni.h: No such file or directory
../../../../../libjava/classpath/tools/toolwrapper.c:45:3: error: #error JNI version 1.2 or greater required
../../../../../libjava/classpath/tools/toolwrapper.c:51: error: expected specifier-qualifier-list before âJNIEnvâ
I committed the attached fix.
Tom
2006-06-14 Thomas Fitzsimmons <fitzsim@redhat.com>
* classpath/tools/Makefile.am (gappletviewer_CFLAGS): Add
-I$(top_srcdir)/include.
(gjarsigner_CFLAGS): Likewise.
(gkeytool_CFLAGS): Likewise.
* classpath/tools/Makefile.in: Regenerate.
Index: classpath/tools/Makefile.in
===================================================================
--- classpath/tools/Makefile.in (revision 114633)
+++ classpath/tools/Makefile.in (working copy)
@@ -343,6 +343,7 @@
@CREATE_WRAPPERS_TRUE@gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
@CREATE_WRAPPERS_TRUE@gappletviewer_SOURCES = toolwrapper.c
@CREATE_WRAPPERS_TRUE@gappletviewer_CFLAGS = -Wall \
+@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"appletviewer\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gappletviewer\""
@@ -350,6 +351,7 @@
@CREATE_WRAPPERS_TRUE@gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
@CREATE_WRAPPERS_TRUE@gjarsigner_SOURCES = toolwrapper.c
@CREATE_WRAPPERS_TRUE@gjarsigner_CFLAGS = -Wall \
+@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"jarsigner\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gjarsigner\""
@@ -357,6 +359,7 @@
@CREATE_WRAPPERS_TRUE@gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
@CREATE_WRAPPERS_TRUE@gkeytool_SOURCES = toolwrapper.c
@CREATE_WRAPPERS_TRUE@gkeytool_CFLAGS = -Wall \
+@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"keytool\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gkeytool\""
Index: classpath/tools/Makefile.am
===================================================================
--- classpath/tools/Makefile.am (revision 114633)
+++ classpath/tools/Makefile.am (working copy)
@@ -51,6 +51,7 @@
gappletviewer_SOURCES = toolwrapper.c
gappletviewer_CFLAGS = -Wall \
+ -I$(top_srcdir)/include \
-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
-DTOOLPACKAGE="\"appletviewer\"" \
-DTOOLNAME="\"gappletviewer\""
@@ -58,6 +59,7 @@
gjarsigner_SOURCES = toolwrapper.c
gjarsigner_CFLAGS = -Wall \
+ -I$(top_srcdir)/include \
-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
-DTOOLPACKAGE="\"jarsigner\"" \
-DTOOLNAME="\"gjarsigner\""
@@ -65,6 +67,7 @@
gkeytool_SOURCES = toolwrapper.c
gkeytool_CFLAGS = -Wall \
+ -I$(top_srcdir)/include \
-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
-DTOOLPACKAGE="\"keytool\"" \
-DTOOLNAME="\"gkeytool\""