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

mk/buildhlp.mk

@@ -49,15 +49,27 @@ ifeq (${_CHECKSUM_COOKIE},)
 endif
 ifeq ($(EXTRACT_OVERRIDE),1)
 	${MAKE} do-extract
-else	
+else
 	${EXTRACT_CMD}
 endif
 	@${MAKE} post-extract $(MAKE_TRACE)
 	touch $@
 
 __use_generic_patch_target:=42
-else ifeq ($(strip ${_IN_PACKAGE}),1)
-$(warning This package does not use the generic extraction and patch target; it's most likely to fail.)
+else
+include ${TOPDIR}/mk/fetch.mk
+${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
+	$(MAKE) fetch
+ifeq (${_CHECKSUM_COOKIE},)
+	rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
+endif
+ifeq ($(EXTRACT_OVERRIDE),1)
+	${MAKE} do-extract
+else
+	${EXTRACT_CMD}
+endif
+	@${MAKE} post-extract $(MAKE_TRACE)
+	touch $@
 endif
 
 ifeq ($(strip ${__use_generic_patch_target}),42)

mk/fetch.mk

@@ -59,14 +59,7 @@ endif
 define FETCH_template
 $(1):
 	@fullname='$(1)'; \
-	subname=$$$${fullname##$${DISTDIR}/}; \
 	filename=$$$${fullname##*/}; \
-	i='$${LOCAL_DISTDIR}'; \
-	if [[ -n $$$$i && -e $$$$i/$$$$subname ]]; then \
-		cd "$$$$i"; \
-		echo pax -rw "$$$$subname" '$${DISTDIR}/'; \
-		exec pax -rw "$$$$subname" '$${DISTDIR}/'; \
-	fi; \
 	mkdir -p "$$$${fullname%%/$$$$filename}"; \
 	cd "$$$${fullname%%/$$$$filename}"; \
 	for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \

package/openjdk/Makefile

@@ -24,7 +24,6 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://icedtea.classpath.org/download/drops/ \
 			http://icedtea.classpath.org/download/source/
 
-#PKG_CFLINE_OPENJDK:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
 PKG_SYSTEM_DEPENDS:=	!lemote-yeelong !linksys-ag241 !fon-fon2100
@@ -55,7 +54,6 @@ PKGCD_ZERO:=		zero-assembly backend
 PKGCD_SHARK:=		Shark JIT backend (needs eglibc/glibc)
 PKGCB_SHARK:=		llvm
 PKGCD_CACAO:=		Cacao JIT backend
-PKGCD_JAMVM:=		JamVM backend
 
 include $(TOPDIR)/mk/package.mk
 
@@ -75,13 +73,8 @@ 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 \
-			--disable-bootstrap \
+CONFIGURE_COMMON:=	--disable-docs \
 			--enable-openjdk-cross-compilation \
 			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
@@ -97,18 +90,15 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
 			--without-rhino
 
+CONFIGURE_ARGS+=	$(CONFIGURE_BACKEND)
+CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
+CONFIGURE_ARGS+=	--disable-bootstrap
+
 CONFIGURE_ENV+=		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin
 MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
-			GCC_HONOUR_COPTS=s \
-			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
-
-OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
-			ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
-			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
-			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
-			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
+			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH)
 ALL_TARGET:=		icedtea
 
 # add include path for Xrender.h from staging directory
@@ -128,7 +118,7 @@ do-extract:
 
 pre-configure:
 	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export $(MAKE_ENV) ${OPENJDK_NATIVE_ENV} ; ./configure \
+	export $(MAKE_ENV); ./configure \
 			${CONFIGURE_TRIPLE} \
 			$(CONFIGURE_BACKEND) \
 	   		--prefix=/usr \
@@ -139,22 +129,8 @@ pre-configure:
 			--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 \
-			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-			--with-ecj-jar=$(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar \
-			--without-rhino ;\
-	env ${OPENJDK_NATIVE_ENV} $(MAKE) icedtea-ecj
+			$(CONFIGURE_COMMON) ;\
+	env ${MAKE_ENV} $(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

package/openjdk/patches/icedtea6-Makefile_in.patch

@@ -1,41 +1,5 @@
 --- 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
-@@ -328,7 +328,7 @@
- am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
--build_alias = @build_alias@
-+build_alias = ${BUILD_ALIAS}
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-@@ -339,7 +339,7 @@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
--host_alias = @host_alias@
-+host_alias = ${HOST_ALIAS}
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-@@ -362,7 +362,7 @@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
--target_alias = @target_alias@
-+target_alias = ${TARGET_ALIAS}
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-@@ -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 \
--@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPRl openjdk.hg openjdk ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPR openjdk.hg openjdk ; \
- @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 +1576,7 @@ clean-overlay:
  # FIXME (missing): Rename to clone-ecj.
  stamps/extract-ecj.stamp: $(OPENJDK_TREE)
@@ -66,13 +30,3 @@
  	touch stamps/native-ecj.stamp
  
  clean-native-ecj:
-@@ -2167,6 +2167,9 @@
- stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
- @BUILD_JAMVM_TRUE@	cd jamvm/jamvm && \
- @BUILD_JAMVM_TRUE@	./autogen.sh --with-java-runtime-library=openjdk \
-+@BUILD_JAMVM_TRUE@	  --host=$(host_alias) \
-+@BUILD_JAMVM_TRUE@	  --build=$(build_alias) \
-+@BUILD_JAMVM_TRUE@	  --target=$(target_alias) \
- @BUILD_JAMVM_TRUE@	  --prefix=$(abs_top_builddir)/jamvm/install ; \
- @BUILD_JAMVM_TRUE@	$(MAKE) ; \
- @BUILD_JAMVM_TRUE@	$(MAKE) install