[openjdk-8] 03/03: Added the configure parameters to build Zero/Shark on non Hotspot architectures

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 1d1ef84e3c5e6394d4aa56fdf3544c127f2dbc52
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 7 16:32:11 2014 +0200

    Added the configure parameters to build Zero/Shark on non Hotspot architectures
---
 debian/rules | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6c45b10..d220c5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -433,7 +433,6 @@ endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
   CONFIGURE_ARGS += \
-	--with-jvm-variants=client \
 	--disable-precompiled-headers
 endif
 
@@ -446,11 +445,16 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(cacao_archs)))
   endif
 endif
 
-ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
-  CONFIGURE_ARGS += --enable-zero
-  ifneq (,$(filter $(DEB_HOST_ARCH), $(shark_archs)))
-    CONFIGURE_ARGS += --enable-shark
-  endif
+# Define the JVM variants to build
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
+  CONFIGURE_ARGS += --with-jvm-variants=client
+else ifneq (,$(filter $(DEB_HOST_ARCH), $(shark_archs)))
+  CONFIGURE_ARGS += --with-jvm-variants=zero,zeroshark
+else ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
+  CONFIGURE_ARGS += --with-jvm-variants=zero
+else
+  #FIXME zero doesn't build
+  #CONFIGURE_ARGS += --with-jvm-variants=server,zero
 endif
 
 EXTRA_BUILD_ENV += LIBFFI_LIBS=-lffi_pic

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git