summaryrefslogtreecommitdiff
path: root/jtools/classpath
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-24 18:27:33 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-24 18:27:33 +0100
commit148249d08af2ef833175d3f9176c6709798d4a14 (patch)
treedc39146d700ae5a224c45885719a2bc8934bd7eb /jtools/classpath
parent18a6922a938023cb061b7cd9895412549cb17288 (diff)
parent826fae84981bf030b6bb9d20117a1a1634ba3334 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'jtools/classpath')
-rw-r--r--jtools/classpath/Makefile42
-rw-r--r--jtools/classpath/patches/classpath-fix.patch12
2 files changed, 0 insertions, 54 deletions
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
deleted file mode 100644
index 06f59e1a0..000000000
--- a/jtools/classpath/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:= classpath
-PKG_VERSION:= 0.98
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 90c6571b8b0309e372faa0f9f6255ea9
-PKG_SITES:= ${MASTER_SITE_GNU:=classpath/}
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
-
-CPENV:= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
- PATH=${STAGING_JAVA_HOST_DIR}/usr/bin:$$PATH \
- CLASSPATH=${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- (cd $(WRKBUILD); env $(CPENV) ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \
- --disable-local-sockets \
- --disable-alsa \
- --disable-gconf-peer \
- --disable-gtk-peer \
- --disable-qt-peer \
- --disable-dssi \
- --disable-plugin \
- --disable-examples \
- --disable-gjdoc \
- --with-jar=no \
- --disable-Werror)
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- env $(CPENV) ${MAKE} -C ${WRKBUILD}
- touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
- ${MAKE} -C ${WRKBUILD} install
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/classpath/patches/classpath-fix.patch b/jtools/classpath/patches/classpath-fix.patch
deleted file mode 100644
index e03eb2342..000000000
--- a/jtools/classpath/patches/classpath-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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