summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/openjdk/Makefile2
-rw-r--r--package/openjdk/patches/llvm-headers.patch5
2 files changed, 4 insertions, 3 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index fb7e89be4..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 \
@@ -136,6 +137,7 @@ pre-configure:
--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
--without-rhino ;\
mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \
+ mkdir -p $(WRKBUILD)/openjdk.build/gensrc/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 \
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 <llvm/ModuleProvider.h>
#endif