From 0370a1df6b4a7d6be98decb450e0f7d1207a702f Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 24 Dec 2010 09:31:32 -0800
Subject: [PATCH] 6997210: Solaris 11 has no development support for DGA:
 Cannot build JDK

Reviewed-by: bae, ohair
---
 jdk/make/sun/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jdk/make/sun/Makefile b/jdk/make/sun/Makefile
index 31e1bdd866e..ba7b10e7237 100644
--- a/jdk/make/sun/Makefile
+++ b/jdk/make/sun/Makefile
@@ -42,7 +42,15 @@ ifneq ($(PLATFORM), windows)
   ifndef OPENJDK
     ifeq ($(PLATFORM), solaris)
       ifneq ($(ARCH), amd64)
-        DGA_SUBDIR = jdga
+        # Solaris 11 does not have support for new compilation of DGA code.
+        OS_VERSION = $(shell uname -r)
+        OS_MAJOR_VERSION := $(call MajorVersion,$(OS_VERSION))
+        OS_MINOR_VERSION := $(call MinorVersion,$(OS_VERSION))
+        ifeq ($(shell $(EXPR) $(OS_MAJOR_VERSION) == 5), 1)
+          ifeq ($(shell $(EXPR) $(OS_MINOR_VERSION) \<= 10), 1)
+            DGA_SUBDIR = jdga
+          endif
+        endif
       endif
     endif
   endif