diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 08:12:50 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 08:12:50 +0100 |
| commit | 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f (patch) | |
| tree | 8ed2357d972dbf5b69645916c23856dfad713405 /package/classpath | |
| parent | 053ce49e8a9588bbd729e25ab6a33f8f5190350d (diff) | |
remove jtools/java host dir. use host stuff instead.
fix arm building.
Diffstat (limited to 'package/classpath')
| -rw-r--r-- | package/classpath/Makefile | 12 | ||||
| -rw-r--r-- | package/classpath/patches/classpath-fix.patch | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/package/classpath/Makefile b/package/classpath/Makefile index e63c84e7a..0a8e7e682 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -17,10 +17,21 @@ PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= !cris !arm +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --disable-plugin \ + --disable-tools \ + --disable-examples \ + --disable-gtk-peer \ + --disable-gconf-peer \ + --disable-alsa \ + --disable-Werror \ + --without-x CONFIGURE_ARGS+= --disable-plugin \ --disable-tools \ --disable-examples @@ -37,4 +48,5 @@ classpath-install: $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ $(STAGING_DIR)/usr/share/classpath +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch new file mode 100644 index 000000000..e03eb2342 --- /dev/null +++ b/package/classpath/patches/classpath-fix.patch @@ -0,0 +1,12 @@ +diff -Nur classpath-0.98.orig//lib/Makefile.in classpath-0.98/lib/Makefile.in +--- classpath-0.98.orig//lib/Makefile.in 2009-02-06 02:01:32.000000000 +0100 ++++ classpath-0.98/lib/Makefile.in 2011-08-05 22:55:25.965284504 +0200 +@@ -272,7 +272,7 @@ + uudecode = @uudecode@ + vm_classes = @vm_classes@ + JAVA_DEPEND = java.dep +-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER) ++compile_classpath = $(vm_classes) -cp $(top_srcdir) -cp $(top_srcdir)/external/w3c_dom -cp $(top_srcdir)/external/sax -cp $(top_srcdir)/external/relaxngDatatype -cp $(top_srcdir)/external/jsr166 -cp . -cp $(PATH_TO_GLIBJ_ZIP) -cp $(PATH_TO_ESCHER) + @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes + + # handling source to bytecode compiler programs like gcj, jikes and kjc |