15734212 SUNBT7076895 userland fails to build with jdk1.7 s11-update
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 02 May 2013 10:51:30 -0700
branchs11-update
changeset 2591 31090006a324
parent 2589 8ecfb2b25ddc
child 2592 a7d8d41eeab2
15734212 SUNBT7076895 userland fails to build with jdk1.7 16462162 graphviz java dependency should be on jre-7
components/ant/ant.p5m
components/beanshell/beanshell.p5m
components/berkeleydb/Makefile
components/graphviz/graphviz-java.p5m
components/graphviz/graphviz.p5m
components/junit/Makefile
components/memcached-java/memcached-java.p5m
components/swig/Makefile
components/tomcat/Makefile
components/visual-panels/apache/Makefile
components/visual-panels/core/Makefile
components/visual-panels/core/system-management-visual-panels-doc.p5m
components/visual-panels/coreadm/Makefile
components/visual-panels/examples/Makefile
components/visual-panels/firewall/Makefile
components/visual-panels/make-rules/Makefile.env
components/visual-panels/smf/Makefile
components/visual-panels/sysmon/Makefile
components/visual-panels/time/Makefile
components/visual-panels/usermgr/Makefile
components/visual-panels/zconsole/Makefile
make-rules/shared-macros.mk
--- a/components/ant/ant.p5m	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/ant/ant.p5m	Thu May 02 10:51:30 2013 -0700
@@ -2793,7 +2793,10 @@
 file path=usr/share/doc/ant/manual/api/overview-summary.html
 file path=usr/share/doc/ant/manual/api/overview-tree.html
 file path=usr/share/doc/ant/manual/api/package-list
-file path=usr/share/doc/ant/manual/api/resources/inherit.gif
+file path=usr/share/doc/ant/manual/api/resources/background.gif
+file path=usr/share/doc/ant/manual/api/resources/tab.gif
+file path=usr/share/doc/ant/manual/api/resources/titlebar.gif
+file path=usr/share/doc/ant/manual/api/resources/titlebar_end.gif
 file path=usr/share/doc/ant/manual/api/serialized-form.html
 file path=usr/share/doc/ant/manual/api/stylesheet.css
 file path=usr/share/doc/ant/manual/base_task_classes.html
--- a/components/beanshell/beanshell.p5m	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/beanshell/beanshell.p5m	Thu May 02 10:51:30 2013 -0700
@@ -245,7 +245,10 @@
 file path=usr/share/lib/java/javadoc/beanshell/overview-summary.html
 file path=usr/share/lib/java/javadoc/beanshell/overview-tree.html
 file path=usr/share/lib/java/javadoc/beanshell/package-list
-file path=usr/share/lib/java/javadoc/beanshell/resources/inherit.gif
+file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar.gif
+file path=usr/share/lib/java/javadoc/beanshell/resources/background.gif
+file path=usr/share/lib/java/javadoc/beanshell/resources/tab.gif
+file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar_end.gif
 file path=usr/share/lib/java/javadoc/beanshell/serialized-form.html
 file path=usr/share/lib/java/javadoc/beanshell/stylesheet.css
 file beansh.1 path=usr/share/man/man1/beansh.1
--- a/components/berkeleydb/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/berkeleydb/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -20,11 +20,12 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
+JAVA_HOME=$(JAVA6_HOME)
 PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
 
 COMPONENT_NAME=		berkeleydb
--- a/components/graphviz/graphviz-java.p5m	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/graphviz/graphviz-java.p5m	Thu May 02 10:51:30 2013 -0700
@@ -49,4 +49,4 @@
 license COPYING license=EPL1.0
 license graphviz.license.extra license="Other Notices"
 
-depend fmri=runtime/java type=require
+depend fmri=runtime/java/jre-7 type=require
--- a/components/graphviz/graphviz.p5m	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/graphviz/graphviz.p5m	Thu May 02 10:51:30 2013 -0700
@@ -453,7 +453,7 @@
 # The C# bindings are never brought in automatically, since we don't
 # deliver a C# platform.
 depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
-    type=conditional predicate=runtime/java
+    type=conditional predicate=runtime/java/jre-7
 depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     type=conditional predicate=runtime/lua
 depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
--- a/components/junit/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/junit/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -36,6 +36,8 @@
 include ../../make-rules/ant.mk
 include ../../make-rules/ips.mk
 
+JAVA_HOME=$(JAVA6_HOME)
+
 COMPONENT_BUILD_ARGS 	+= -Ddist=${PROTO_DIR}
 COMPONENT_BUILD_ARGS    += -Djavadocdir=${PROTO_DIR}
 COMPONENT_BUILD_TARGETS += dist
--- a/components/memcached-java/memcached-java.p5m	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/memcached-java/memcached-java.p5m	Thu May 02 10:51:30 2013 -0700
@@ -95,6 +95,9 @@
 file path=usr/share/lib/java/javadoc/memcached-java/api/index.html
 file path=usr/share/lib/java/javadoc/memcached-java/api/overview-tree.html
 file path=usr/share/lib/java/javadoc/memcached-java/api/package-list
-file path=usr/share/lib/java/javadoc/memcached-java/api/resources/inherit.gif
+file path=usr/share/lib/java/javadoc/memcached-java/api/resources/background.gif
+file path=usr/share/lib/java/javadoc/memcached-java/api/resources/tab.gif
+file path=usr/share/lib/java/javadoc/memcached-java/api/resources/titlebar.gif
+file path=usr/share/lib/java/javadoc/memcached-java/api/resources/titlebar_end.gif
 file path=usr/share/lib/java/javadoc/memcached-java/api/serialized-form.html
 file path=usr/share/lib/java/javadoc/memcached-java/api/stylesheet.css
--- a/components/swig/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/swig/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -36,11 +36,15 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
+
 # This is needed because the community provided 'check' target is not viewpath aware
 COMPONENT_PRE_CONFIGURE_ACTION =      ($(CLONEY) $(SOURCE_DIR) $(@D))
 
+CONFIGURE_ENV += JAVA_HOME="$(JAVA_HOME)"
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_OPTIONS +=	--with-javaincl="$(JAVA_HOME)/include"
 
 # common targets
 build:		$(BUILD_32)
--- a/components/tomcat/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/tomcat/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -54,6 +54,8 @@
 include ../../make-rules/ant.mk
 include ../../make-rules/ips.mk
 
+JAVA_HOME=$(JAVA6_HOME)
+COMPONENT_BUILD_ENV += JAVA_HOME="$(JAVA_HOME)"
 COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR)
 COMPONENT_BUILD_TARGETS=download deploy
 
--- a/components/visual-panels/apache/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/apache/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -38,7 +38,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/core/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/core/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -37,7 +37,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(PROTO_DIR)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
--- a/components/visual-panels/core/system-management-visual-panels-doc.p5m	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/core/system-management-visual-panels-doc.p5m	Thu May 02 10:51:30 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
@@ -142,7 +142,10 @@
 file path=usr/share/lib/java/javadoc/smf-old/overview-summary.html
 file path=usr/share/lib/java/javadoc/smf-old/overview-tree.html
 file path=usr/share/lib/java/javadoc/smf-old/package-list
-file path=usr/share/lib/java/javadoc/smf-old/resources/inherit.gif
+file path=usr/share/lib/java/javadoc/smf-old/resources/background.gif
+file path=usr/share/lib/java/javadoc/smf-old/resources/tab.gif
+file path=usr/share/lib/java/javadoc/smf-old/resources/titlebar.gif
+file path=usr/share/lib/java/javadoc/smf-old/resources/titlebar_end.gif
 file path=usr/share/lib/java/javadoc/smf-old/serialized-form.html
 file path=usr/share/lib/java/javadoc/smf-old/stylesheet.css
 file path=usr/share/lib/java/javadoc/vpanels-panel/allclasses-frame.html
@@ -479,7 +482,10 @@
 file path=usr/share/lib/java/javadoc/vpanels-panel/overview-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/overview-tree.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/package-list
-file path=usr/share/lib/java/javadoc/vpanels-panel/resources/inherit.gif
+file path=usr/share/lib/java/javadoc/vpanels-panel/resources/background.gif
+file path=usr/share/lib/java/javadoc/vpanels-panel/resources/tab.gif
+file path=usr/share/lib/java/javadoc/vpanels-panel/resources/titlebar.gif
+file path=usr/share/lib/java/javadoc/vpanels-panel/resources/titlebar_end.gif
 file path=usr/share/lib/java/javadoc/vpanels-panel/serialized-form.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/stylesheet.css
 file path=usr/share/lib/java/javadoc/vpanels-util/allclasses-frame.html
@@ -910,6 +916,9 @@
 file path=usr/share/lib/java/javadoc/vpanels-util/overview-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-util/overview-tree.html
 file path=usr/share/lib/java/javadoc/vpanels-util/package-list
-file path=usr/share/lib/java/javadoc/vpanels-util/resources/inherit.gif
+file path=usr/share/lib/java/javadoc/vpanels-util/resources/background.gif
+file path=usr/share/lib/java/javadoc/vpanels-util/resources/tab.gif
+file path=usr/share/lib/java/javadoc/vpanels-util/resources/titlebar.gif
+file path=usr/share/lib/java/javadoc/vpanels-util/resources/titlebar_end.gif
 file path=usr/share/lib/java/javadoc/vpanels-util/serialized-form.html
 file path=usr/share/lib/java/javadoc/vpanels-util/stylesheet.css
--- a/components/visual-panels/coreadm/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/coreadm/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/examples/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/examples/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
--- a/components/visual-panels/firewall/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/firewall/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/make-rules/Makefile.env	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/make-rules/Makefile.env	Thu May 02 10:51:30 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -125,7 +125,7 @@
 INTLTOOL_MERGE = /usr/bin/intltool-merge
 
 # Set here explicitly to avoid compiling with newer class version
-JDK_HOME = /usr/jdk/instances/jdk1.6.0
+JDK_HOME = $(JAVA7_HOME)
 JAVA_HOME = $(JDK_HOME)
 
 JAVAC = $(JDK_HOME)/bin/javac
--- a/components/visual-panels/smf/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/smf/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/sysmon/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/sysmon/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/time/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/time/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/usermgr/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/usermgr/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
--- a/components/visual-panels/zconsole/Makefile	Tue Apr 30 04:42:01 2013 -0700
+++ b/components/visual-panels/zconsole/Makefile	Thu May 02 10:51:30 2013 -0700
@@ -39,7 +39,7 @@
 COMPONENT_BUILD_ENV +=		ROOT=$(BUILD_DIR)/prototype/$(MACH)
 COMPONENT_BUILD_ENV +=		SRC=$(WS_COMPONENTS)/visual-panels
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
-COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
+COMPONENT_BUILD_ENV +=		JAVA_HOME=$(JAVA_HOME)
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
--- a/make-rules/shared-macros.mk	Tue Apr 30 04:42:01 2013 -0700
+++ b/make-rules/shared-macros.mk	Thu May 02 10:51:30 2013 -0700
@@ -296,7 +296,9 @@
 PYTHON_LIB= /usr/lib/python$(PYTHON_VERSION)/vendor-packages
 PYTHON_DATA= $(PYTHON_LIB)
 
-JAVA_HOME =	/usr/jdk/instances/jdk1.6.0
+JAVA7_HOME =    /usr/jdk/instances/jdk1.7.0
+JAVA6_HOME =    /usr/jdk/instances/jdk1.6.0
+JAVA_HOME = $(JAVA7_HOME)
 
 # This is the default BUILD version of perl
 # Not necessarily the system's default version, i.e. /usr/bin/perl