diff options
Diffstat (limited to 'jtools/classpath')
| -rw-r--r-- | jtools/classpath/Makefile | 8 | ||||
| -rw-r--r-- | jtools/classpath/patches/classpath-fix.patch | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile index d4421bf9a..06f59e1a0 100644 --- a/jtools/classpath/Makefile +++ b/jtools/classpath/Makefile @@ -13,8 +13,12 @@ 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); ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \ + (cd $(WRKBUILD); env $(CPENV) ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \ --disable-local-sockets \ --disable-alsa \ --disable-gconf-peer \ @@ -29,7 +33,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared touch $@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} + env $(CPENV) ${MAKE} -C ${WRKBUILD} touch $@ ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled diff --git a/jtools/classpath/patches/classpath-fix.patch b/jtools/classpath/patches/classpath-fix.patch new file mode 100644 index 000000000..e03eb2342 --- /dev/null +++ b/jtools/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 |