# HG changeset patch
# User John Beck <John.Beck@Oracle.COM>
# Date 1443128923 25200
# Node ID d9d2542d02248b5a0796fe960e89c3e04e361c68
# Parent  282be77f19496fa91e4ad928eda24cd677c5a1b6
21954711 add SOLARIS_{11,12}_ONLY macros for FOSS evaluation project

diff -r 282be77f1949 -r d9d2542d0224 components/apache24/apache-24.p5m
--- a/components/apache24/apache-24.p5m	Thu Sep 24 14:08:10 2015 -0700
+++ b/components/apache24/apache-24.p5m	Thu Sep 24 14:08:43 2015 -0700
@@ -242,7 +242,7 @@
 file path=usr/apache2/2.4/libexec/mod_proxy_connect.so
 file path=usr/apache2/2.4/libexec/mod_proxy_express.so
 file path=usr/apache2/2.4/libexec/mod_proxy_fcgi.so
-file path=usr/apache2/2.4/libexec/mod_proxy_fdpass.so
+$(SOLARIS_12_ONLY)file path=usr/apache2/2.4/libexec/mod_proxy_fdpass.so
 file path=usr/apache2/2.4/libexec/mod_proxy_ftp.so
 file path=usr/apache2/2.4/libexec/mod_proxy_html.so
 file path=usr/apache2/2.4/libexec/mod_proxy_http.so
diff -r 282be77f1949 -r d9d2542d0224 make-rules/ips.mk
--- a/make-rules/ips.mk	Thu Sep 24 14:08:10 2015 -0700
+++ b/make-rules/ips.mk	Thu Sep 24 14:08:43 2015 -0700
@@ -110,6 +110,8 @@
 PKG_MACROS +=		SOLARIS_VERSION=$(SOLARIS_VERSION)
 PKG_MACROS +=		OS_VERSION=$(OS_VERSION)
 PKG_MACROS +=		PKG_SOLARIS_VERSION=$(PKG_SOLARIS_VERSION)
+PKG_MACROS +=		SOLARIS_12_ONLY=$(SOLARIS_12_ONLY)
+PKG_MACROS +=		SOLARIS_11_ONLY=$(SOLARIS_11_ONLY)
 PKG_MACROS +=		HUMAN_VERSION=$(HUMAN_VERSION)
 PKG_MACROS +=		IPS_COMPONENT_VERSION=$(IPS_COMPONENT_VERSION)
 PKG_MACROS +=		COMPONENT_VERSION=$(COMPONENT_VERSION)
diff -r 282be77f1949 -r d9d2542d0224 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Thu Sep 24 14:08:10 2015 -0700
+++ b/make-rules/shared-macros.mk	Thu Sep 24 14:08:43 2015 -0700
@@ -98,6 +98,17 @@
 # Target OS version
 PKG_SOLARIS_VERSION ?= 5.12
 
+# We generally build the default branch on the latest release.  But for
+# the FOSS evaluation repo project, we build on the previous release.
+# Add macros to make that easier.
+ifeq ($(OS_VERSION),5.12)
+SOLARIS_12_ONLY =
+SOLARIS_11_ONLY =\#
+else
+SOLARIS_12_ONLY =\#
+SOLARIS_11_ONLY =
+endif
+
 include $(WS_MAKE_RULES)/ips-buildinfo.mk
 
 COMPILER ?=		studio