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

4 files changed, 79 insertions, 1 deletions

diff --git a/package/llvm/Makefile b/package/llvm/Makefile
new file mode 100644
index 000000000..5aa58d81d
--- /dev/null
+++ b/package/llvm/Makefile
@@ -0,0 +1,43 @@
+# 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:=		llvm
+PKG_VERSION:=		2.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		793138412d2af2c7c7f54615f8943771
+PKG_DESCR:=		collection of modular and reusable compiler and toolchain technologies
+PKG_SECTION:=		lang
+PKG_URL:=		http://llvm.org/
+PKG_SITES:=		http://llvm.org/releases/2.9/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tgz
+#WRKBUILD=               ${WRKSRC}/BuildTools
+
+include $(TOPDIR)/mk/package.mk
+
+TARGET_CFLAGS:=         $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
+# disable honour cflags stuff
+XAKE_FLAGS+=            GCC_HONOUR_COPTS=s
+
+$(eval $(call PKG_template,LLVM,llvm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-configure:
+	mkdir -p $(WRKBUILD)/BuildTools
+	(cd $(WRKBUILD)/BuildTools; env ac_cv_build_exeext="" ../configure ${CONFIGURE_TRIPLE} --prefix=/usr)
+
+do-build:
+	env GCC_HONOUR_COPTS=s ${MAKE} -C ${WRKBUILD}/BuildTools
+
+do-install:
+	env GCC_HONOUR_COPTS=s ${MAKE} -C ${WRKBUILD}/BuildTools DESTDIR=$(STAGING_TARGET_DIR) install 
+
+llvm-install:
+	$(INSTALL_DIR) $(IDIR_LLVM)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index fea125bb8..f5acd06fc 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -50,6 +50,7 @@ PKG_SUBPKGS:=		OPENJDK
 PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO
 PKGCD_ZERO:=		zero-assembly backend
 PKGCD_SHARK:=		JIT backend
+PKGCB_SHARK:=		llvm
 PKGCD_CACAO:=		Cacao JIT backend
 PKGCD_JAMVM:=		JamVM backend
 
@@ -95,6 +96,7 @@ MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			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) \
+			PATH=$${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)
 ALL_TARGET:=		icedtea
@@ -109,7 +111,7 @@ do-extract:
 
 pre-configure:
 	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export ${OPENJDK_NATIVE_ENV} $(MAKE_ENV) ; ./configure \
+	export $(MAKE_ENV) ${OPENJDK_NATIVE_ENV} ; ./configure \
 			${CONFIGURE_TRIPLE} \
 			$(CONFIGURE_BACKEND) \
 	   		--prefix=/usr \
diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch
index e69de29bb..46325008c 100644
--- a/package/openjdk/patches/disable-sizers.patch
+++ b/package/openjdk/patches/disable-sizers.patch
@@ -0,0 +1,12 @@
+--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile	2011-02-28 17:06:12.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile	2011-04-13 12:00:18.618922673 +0200
+@@ -237,7 +237,8 @@
+ 	$(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
+ 	    $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
+ 
+-$(SIZES): $(SIZERS)
++$(SIZES):
++	$(prep-target)
+ 	@if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
+ 	    $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
+ 	    $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
diff --git a/package/openjdk/patches/llvm-headers.patch b/package/openjdk/patches/llvm-headers.patch
new file mode 100644
index 000000000..7014dcb88
--- /dev/null
+++ b/package/openjdk/patches/llvm-headers.patch
@@ -0,0 +1,21 @@
+diff -Nur openjdk-6.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp
+--- openjdk-6.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-02-28 17:03:21.000000000 +0100
++++ openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-29 18:07:20.171550601 +0200
+@@ -43,7 +43,7 @@
+ #include <llvm/ModuleProvider.h>
+ #endif
+ #include <llvm/Support/IRBuilder.h>
+-#include <llvm/System/Threading.h>
++#include <llvm/Support/Threading.h>
+ #include <llvm/Target/TargetSelect.h>
+ #include <llvm/Type.h>
+ #include <llvm/ExecutionEngine/JITMemoryManager.h>
+@@ -52,7 +52,7 @@
+ #include <llvm/ExecutionEngine/JIT.h>
+ #include <llvm/ADT/StringMap.h>
+ #include <llvm/Support/Debug.h>
+-#include <llvm/System/Host.h>
++#include <llvm/Support/Host.h>
+ #endif
+ 
+ #include <map>