pass ADK_ECJ to ease “building” of native-ecj

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>

package/openjdk/Makefile

@@ -34,7 +34,7 @@ DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
 			$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
 			jaxp144_01.zip \
 			jdk6-jaf-b20.zip \
-			jdk6-jaxws-b20.zip
+			jdk6-jaxws-b20.zip \
 			${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
 NO_DISTFILES:=		1
 WRKDIST=		${WRKDIR}
@@ -81,27 +81,29 @@ do-extract:
 
 pre-configure:
 	cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
-		env JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
-		DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-		./configure \
-			--enable-bootstrap \
-			--enable-zero \
-			--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
-			--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
-			--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
-			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
-			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
-			--disable-docs \
-			--disable-openjdk-cross-compilation \
-			--with-xalan2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-			--with-xalan2-serializer-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-			--with-xerces2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-			--without-rhino \
-			--disable-xrender \
-			--disable-nss \
-		&& ${MAKE}
+	export \
+	    JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
+	    DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+	    LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+	    ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
+	; ./configure \
+		--enable-bootstrap \
+		--enable-zero \
+		--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
+		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
+		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+		--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
+		--disable-docs \
+		--disable-openjdk-cross-compilation \
+		--with-xalan2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
+		--with-xalan2-serializer-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
+		--with-xerces2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
+		--without-rhino \
+		--disable-xrender \
+		--disable-nss \
+	&& ${MAKE}
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin

package/openjdk/patches/patch-icedtea6-1_10_Makefile_in

@@ -1,5 +1,5 @@
---- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in	2011-03-02 20:48:45.161291458 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in	2011-03-28 17:00:03.591807998 +0200
+--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in	2011-03-02 20:48:45.000000000 +0100
++++ w-openjdk-6-1/icedtea6-1.10/Makefile.in	2011-04-02 23:33:17.000000000 +0200
 @@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow
  @OPENJDK_SRC_DIR_FOUND_TRUE@	  cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
  @OPENJDK_SRC_DIR_FOUND_TRUE@	fi
@@ -18,12 +18,24 @@
  	fi
  	mkdir -p stamps
  	touch stamps/extract-ecj.stamp
-@@ -1644,7 +1644,7 @@ clean-patch-ecj:
+@@ -1642,11 +1642,15 @@ clean-patch-ecj:
+ # ===========================
+ 
  stamps/native-ecj.stamp: 
- 	mkdir -p stamps ; \
- 	if test "x$(GCJ)" != "xno"; then \
+-	mkdir -p stamps ; \
+-	if test "x$(GCJ)" != "xno"; then \
 -	  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+	  $(GCJ) -static $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- 	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
- 	fi ; \
+-	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
+-	fi ; \
++	if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
++		ln -s "${ADK_ECJ}" native-ecj; \
++	else \
++		mkdir -p stamps ; \
++		if test "x$(GCJ)" != "xno"; then \
++		  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
++		    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
++		fi ; \
++	fi; \
  	touch stamps/native-ecj.stamp
+ 
+ clean-native-ecj: