rename package to openjdk

- fix bootstrap build
- optmize source extraction and layout

5 files changed, 114 insertions, 60 deletions

diff --git a/package/icedtea6/Makefile b/package/icedtea6/Makefile
deleted file mode 100644
index 39bdea2b9..000000000
--- a/package/icedtea6/Makefile
+++ /dev/null
@@ -1,54 +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:=		icedtea6
-PKG_VERSION:=		1.10
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		fd3f35e8a8a2ef9a64c035ed66cea06d 2d2bbbb0f9b81f1fec41ec730da8a933
-PKG_DESCR:=		OpenJDK Java VM
-PKG_SECTION:=		lang
-PKG_URL:=		http://icedtea.classpath.org/
-PKG_SITES:=		http://icedtea.classpath.org/download/source/ \
-			http://download.java.net/openjdk/jdk6/promoted/b22/
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz openjdk-6-src-b22-28_feb_2011.tar.gz
-
-PKG_SUBPKGS:=		OPENJDK
-
-PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
-PKGCD_ZERO:=		zero-assembly backend
-PKGCD_SHARK:=		JIT backend
-PKGCD_CACAO:=		Cacao JIT backend
-PKGCD_JAMVM:=		JamVM backend
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
-CONFIGURE_ARGS+=	--enable-zero
-endif
-ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
-CONFIGURE_ARGS+=	--enable-shark 
-endif
-
-
-CONFIGURE_ARGS+=	--disable-docs \
-			--enable-bootstrap \
-			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
-			--with-xalan2-jar=/opt/local/share/java/xalan.jar \
-			--with-xalan2-serializer-jar=/opt/local/share/java/serializer.jar \
-			--with-xerces2-jar=/opt/local/share/java/xercesImpl.jar \
-			--with-openjdk-src-zip=$(TOPDIR)/dl/openjdk-6-src-b22-28_feb_2011.tar.gz \
-			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
-			--without-rhino \
-			--disable-xrender \
-			--disable-nss
-
-openjdk-install:
-	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
new file mode 100644
index 000000000..73812e426
--- /dev/null
+++ b/package/openjdk/Makefile
@@ -0,0 +1,86 @@
+# 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:=		openjdk
+PKG_VERSION:=		6
+PKG_EXTRAVER:=		b22-28_feb_2011
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 fd3f35e8a8a2ef9a64c035ed66cea06d
+PKG_DESCR:=		OpenJDK Java VM
+PKG_SECTION:=		lang
+PKG_BUILDDEP:=		xproto jpeg zlib libX11 libpng freetype
+PKG_URL:=		http://openjdk.org/
+PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
+			http://icedtea.classpath.org/download/source/
+
+# autotools infrastructure for OpenJDK
+ICEDTEA_NAME:=		icedtea6
+ICEDTEA_VERSION:=	1.10
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
+NO_DISTFILES:=		1
+WRKDIST=		${WRKDIR}
+
+PKG_SUBPKGS:=		OPENJDK
+PKG_CFLINE_OPENJDK:=	select ADK_TOOLCHAIN_GCC_JAVA
+
+PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
+PKGCD_ZERO:=		zero-assembly backend
+PKGCD_SHARK:=		JIT backend
+PKGCD_CACAO:=		Cacao JIT backend
+PKGCD_JAMVM:=		JamVM backend
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
+CONFIGURE_ARGS+=	--enable-zero
+endif
+ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
+CONFIGURE_ARGS+=	--enable-shark 
+endif
+
+CONFIGURE_ARGS+=	--disable-docs \
+			--enable-bootstrap \
+			--disable-openjdk-cross-compilation \
+			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
+			--with-xalan2-jar=/usr/share/java/xalan.jar \
+			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
+			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
+			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
+			--with-gcj \
+			--without-rhino \
+			--disable-xrender \
+			--disable-nss
+
+do-extract:
+	(cd ${WRKBUILD}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
+	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+
+pre-configure:
+	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \
+		./configure \
+			--enable-bootstrap \
+			--enable-zero \
+			--disable-docs \
+			--disable-openjdk-cross-compilation \
+			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
+			--with-xalan2-jar=/usr/share/java/xalan.jar \
+			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
+			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
+			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
+			--with-gcj \
+			--without-rhino \
+			--disable-xrender \
+			--disable-nss \
+	);
+	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} )
+
+openjdk-install:
+	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/icedtea6/patches/patch-Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
index 652a4bc8e..7e19f5159 100644
--- a/package/icedtea6/patches/patch-Makefile_in
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -1,6 +1,6 @@
---- icedtea6-1.10.orig/Makefile.in	2011-03-02 20:48:45.000000000 +0100
-+++ icedtea6-1.10/Makefile.in	2011-03-27 23:52:31.000000000 +0200
-@@ -1329,7 +1317,7 @@ stamps/extract-openjdk.stamp: stamps/dow
+--- 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
+@@ -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
  @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	if ! test -d openjdk ; then \
@@ -9,7 +9,7 @@
  @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	fi
  @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	set -e ; \
  @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	if ! test -d openjdk ; \
-@@ -1576,7 +1564,7 @@ clean-overlay:
+@@ -1576,7 +1576,7 @@ clean-overlay:
  # FIXME (missing): Rename to clone-ecj.
  stamps/extract-ecj.stamp: $(OPENJDK_TREE)
  	if ! test -d openjdk-ecj ; then \
@@ -18,3 +18,12 @@
  	fi
  	mkdir -p stamps
  	touch stamps/extract-ecj.stamp
+@@ -1644,7 +1644,7 @@ clean-patch-ecj:
+ stamps/native-ecj.stamp: 
+ 	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 ; \
+ 	touch stamps/native-ecj.stamp
diff --git a/package/icedtea6/patches/patch-configure b/package/openjdk/patches/patch-icedtea6-1_10_configure
index 28ad4a0dc..d9b96d1d4 100644
--- a/package/icedtea6/patches/patch-configure
+++ b/package/openjdk/patches/patch-icedtea6-1_10_configure
@@ -1,5 +1,5 @@
---- icedtea6-1.10.orig/configure	2011-03-02 20:48:44.000000000 +0100
-+++ icedtea6-1.10/configure	2011-03-27 22:27:06.000000000 +0200
+--- w-openjdk-6-1.orig/icedtea6-1.10/configure	2011-03-02 20:48:44.321157333 +0100
++++ w-openjdk-6-1/icedtea6-1.10/configure	2011-03-28 15:30:08.791808629 +0200
 @@ -10805,22 +10805,6 @@ fi
  
  
diff --git a/package/openjdk/patches/patch-openjdk-6_Makefile b/package/openjdk/patches/patch-openjdk-6_Makefile
new file mode 100644
index 000000000..2364d7ec0
--- /dev/null
+++ b/package/openjdk/patches/patch-openjdk-6_Makefile
@@ -0,0 +1,13 @@
+--- w-openjdk-6-1.orig/openjdk-6/Makefile	2011-02-28 17:02:07.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/Makefile	2011-03-28 20:06:13.751809044 +0200
+@@ -25,9 +25,7 @@
+ 
+ BUILD_PARENT_DIRECTORY=.
+ 
+-ifndef TOPDIR
+-  TOPDIR:=.
+-endif
++TOPDIR:=.
+ 
+ ifndef JDK_TOPDIR
+   JDK_TOPDIR=$(TOPDIR)/jdk