Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/mpfr/Makefile

1 files changed, 79 insertions, 43 deletions

diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 20c231abe..46f38abb6 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -15,7 +15,9 @@ PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
 			d526d0848c88607ce4e3a0a4edb75d50
 PKG_DESCR:=		OpenJDK Java VM
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		xproto jpeg zlib libX11 libpng freetype
+PKG_BUILDDEP:=		alsa-lib xproto jpeg zlib giflib libpng freetype cups
+PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst
+PKG_DEPENDS:=		zlib libstdcxx libffi libpthread
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
@@ -43,8 +45,6 @@ WRKDIST=		${WRKDIR}
 WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 
 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
@@ -55,68 +55,104 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CFLAGS:=         $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
+BOOTSTRAPJDK:=		${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
 
 ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
-CONFIGURE_ARGS+=	--enable-zero
+CONFIGURE_BACKEND:=	--enable-zero
 endif
 ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
-CONFIGURE_ARGS+=	--enable-shark
+CONFIGURE_BACKEND:=	--enable-shark
+endif
+ifeq ($(ADK_PACKAGE_OPENJDK_CACAO),y)
+CONFIGURE_BACKEND:=	--enable-cacao
+endif
+ifeq ($(ADK_PACKAGE_OPENJDK_JAMVM),y)
+CONFIGURE_BACKEND:=	--enable-jamvm
 endif
 
+CONFIGURE_ARGS+=	$(CONFIGURE_BACKEND)
 CONFIGURE_ARGS+=	--disable-docs \
-			--enable-bootstrap \
+			--disable-bootstrap \
 			--enable-openjdk-cross-compilation \
-			--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=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
 			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
 			--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
-			--without-rhino \
-			--disable-xrender \
-			--disable-nss
-
-OPENJDK_BUILD_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
-OPENJDK_BUILD_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_BUILD_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_BUILD_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
-CONFIGURE_ENV+=		${OPENJDK_BUILD_ENV}
-MAKE_ENV+=		${OPENJDK_BUILD_ENV}
+			--with-jdk-home=$(BOOTSTRAPJDK) \
+			--with-java=$(BOOTSTRAPJDK)/bin/java \
+			--with-javac=$(BOOTSTRAPJDK)/bin/javac \
+			--with-javah=$(BOOTSTRAPJDK)/bin/javah \
+			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
+			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
+			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
+			--without-rhino
+
+MAKE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+		GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH)
+
+OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
+			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
+ALL_TARGET:=		icedtea
 
 do-extract:
-	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
+	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \
 		tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)
 	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
 	cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
 	mkdir -p ${WRKBUILD}/drops
-	cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
-	    ${WRKBUILD}/drops
+	cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops
 
 pre-configure:
 	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export ${OPENJDK_BUILD_ENV}; ./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=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
-		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
-		--disable-docs \
-		--disable-openjdk-cross-compilation \
-		--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-		--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-		--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-		--without-rhino \
-		--disable-xrender \
-		--disable-nss \
-	&& ${MAKE}
+	export ${OPENJDK_NATIVE_ENV} $(MAKE_ENV) ; ./configure \
+			${CONFIGURE_TRIPLE} \
+			$(CONFIGURE_BACKEND) \
+	   		--prefix=/usr \
+			--bindir=/usr/bin \
+	    		--datadir=/usr/share \
+	                --mandir=/usr/share/man \
+	  		--libexecdir=/usr/libexec \
+			--localstatedir=/var \
+			--sysconfdir=/etc \
+			--enable-bootstrap \
+			--enable-openjdk-cross-compilation \
+			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
+			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
+			--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
+			--with-jdk-home=$(BOOTSTRAPJDK) \
+			--with-java=$(BOOTSTRAPJDK)/bin/java \
+			--with-javac=$(BOOTSTRAPJDK)/bin/javac \
+			--with-javah=$(BOOTSTRAPJDK)/bin/javah \
+			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
+			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
+			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
+			--without-rhino ;\
+	mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizes.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizes.32 ; \
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizer.32 ; \
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/sizer.32 ; \
+	$(MAKE) icedtea-ecj
+	# fixup symlinks to bootstrap jdk
+	ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java
+	ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac
+	ln -sf $(BOOTSTRAPJDK)/bin/javah $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javah
+	ln -sf $(BOOTSTRAPJDK)/bin/jar $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/jar
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizes.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizes.32
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizer.32
+	mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/sizer.32
 
 openjdk-install:
-	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
+	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr
+	$(CP) $(WRKBUILD)/openjdk.build/j2re-image/* $(IDIR_OPENJDK)/usr 
 
 include ${TOPDIR}/mk/pkg-bottom.mk