fix merge conflict

jtools/ant/Makefile

@@ -20,7 +20,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
 	cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar
 	cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional
 	cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \
-		BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \
 		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \
 		$(BASH) build.sh

jtools/ecj/Makefile

@@ -21,7 +21,6 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar
-	#$(CP) $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
 	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \
 		${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
@@ -33,9 +32,5 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
 		${STAGING_JAVA_HOST_DIR}/usr/bin/gij
 	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij
-	rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java
-	rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java
-	cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java
-	cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java
 
 include $(TOPDIR)/mk/tools.mk

jtools/jamvm/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
@@ -23,7 +23,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
                CC='${CC_FOR_BUILD}' \
                CXX='${CXX_FOR_BUILD}' \
            ./configure \
-               --prefix=/usr \
+               --prefix=$(STAGING_JAVA_HOST_DIR)/usr \
                --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr
 	touch $@
 
@@ -32,8 +32,8 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 	touch $@
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-	$(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java
-	$(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java
+	${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE)
+	ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java
+	ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java
 
 include $(TOPDIR)/mk/tools.mk

mk/build.mk

@@ -266,7 +266,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU
+export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD CXX_FOR_BUILD QEMU
 endif
 
 all: menuconfig

mk/vars.mk

@@ -140,6 +140,7 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			CROSS='$(TARGET_CROSS)'
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
+			CXX_FOR_BUILD='${CXX_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
 			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \

package/openjdk/Makefile

@@ -52,7 +52,7 @@ WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 PKG_SUBPKGS:=		OPENJDK
 PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO
 PKGCD_ZERO:=		zero-assembly backend
-PKGCD_SHARK:=		JIT backend
+PKGCD_SHARK:=		Shark JIT backend
 PKGCB_SHARK:=		llvm
 PKGCD_CACAO:=		Cacao JIT backend
 PKGCD_JAMVM:=		JamVM backend