summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorwbx <wbx@openadk.org>2011-04-10 15:38:55 +0200
committerwbx <wbx@openadk.org>2011-04-10 15:38:55 +0200
commit6e461b82e0b6a4060e35c0ef61ca55663924aba1 (patch)
treecd3b25398023ccdffaac0781705a13885fb7655a /package
parent0066255aa4d5c652c73b4fa2a758bf43e4925dc3 (diff)
parent4de18c058b9d3a7463b32a18b47f4ac6d5670c4c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/openjdk/Makefile18
-rw-r--r--package/openjdk/patches/patch-icedtea6-1_10_Makefile_in27
2 files changed, 40 insertions, 5 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index a8596270c..d8a932f70 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -59,12 +59,19 @@ 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 \
--disable-bootstrap \
--enable-openjdk-cross-compilation \
@@ -85,7 +92,8 @@ MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
GCC_HONOUR_COPTS=s
OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
- GCC_HONOUR_COPTS=s
+ GCC_HONOUR_COPTS=s \
+ TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
ALL_TARGET:= icedtea
do-extract:
@@ -98,8 +106,9 @@ do-extract:
pre-configure:
cd ${WRKBUILD}; rm -rf config.{cache,status}; \
- export ${OPENJDK_NATIVE_ENV}; ./configure \
+ export ${OPENJDK_NATIVE_ENV} $(MAKE_ENV) ; ./configure \
${CONFIGURE_TRIPLE} \
+ $(CONFIGURE_BACKEND) \
--prefix=/usr \
--bindir=/usr/bin \
--datadir=/usr/share \
@@ -108,7 +117,6 @@ pre-configure:
--localstatedir=/var \
--sysconfdir=/etc \
--enable-bootstrap \
- --enable-zero \
--enable-openjdk-cross-compilation \
--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
index 50667a68a..0f49fe67a 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -1,5 +1,32 @@
--- 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