From 380aa2b20006281be9971f6e3a13f33719832335 Mon Sep 17 00:00:00 2001 From: wbx Date: Fri, 29 Apr 2011 20:10:22 +0200 Subject: fix shark backend --- package/openjdk/Makefile | 1 + package/openjdk/patches/llvm-headers.patch | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package/openjdk') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index f5acd06fc..916c83bc9 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -78,6 +78,7 @@ CONFIGURE_ARGS+= $(CONFIGURE_BACKEND) CONFIGURE_ARGS+= --disable-docs \ --disable-bootstrap \ --enable-openjdk-cross-compilation \ + --with-llvm-config=$(STAGING_TARGET_DIR)/usr/bin/llvm-config \ --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 \ diff --git a/package/openjdk/patches/llvm-headers.patch b/package/openjdk/patches/llvm-headers.patch index 7014dcb88..d0f42146d 100644 --- a/package/openjdk/patches/llvm-headers.patch +++ b/package/openjdk/patches/llvm-headers.patch @@ -1,6 +1,5 @@ -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 +--- w-openjdk-6.orig/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-02-28 17:03:21.000000000 +0100 ++++ w-openjdk-6/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-04-29 18:07:20.171550601 +0200 @@ -43,7 +43,7 @@ #include #endif -- cgit v1.2.3