24791238 do not publish apache24 when BUILD_TYPE=evaluation
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 03 Oct 2016 16:45:13 -0700
changeset 7029 517b31b09adc
parent 7028 ab6ecc2d7d06
child 7030 496c07261afc
24791238 do not publish apache24 when BUILD_TYPE=evaluation
components/apache24/Makefile
--- a/components/apache24/Makefile	Mon Oct 03 16:23:08 2016 -0700
+++ b/components/apache24/Makefile	Mon Oct 03 16:45:13 2016 -0700
@@ -38,6 +38,10 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 TEST_TARGET= $(NO_TESTS)
+
+# Requires newer Kerberos, unavailable in 11.3
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
 include $(WS_MAKE_RULES)/common.mk
 
 # This is baked into the Apache module build configuration and is used by apxs
@@ -59,10 +63,7 @@
 CONFIGURE_OPTIONS +=	--enable-layout=Solaris
 CONFIGURE_OPTIONS +=	--enable-mpms-shared=all
 CONFIGURE_OPTIONS +=	--enable-mods-shared=all
-ifeq ($(OS_VERSION), 5.12)
-# workaround for a known issue with 2.4.23 (should be probably removed with 2.4.24) 
 CONFIGURE_OPTIONS +=	--enable-proxy-fdpass
-endif
 CONFIGURE_OPTIONS +=	--enable-exception-hook
 CONFIGURE_OPTIONS +=	--enable-cgi
 CONFIGURE_OPTIONS +=	--enable-suexec