24791247 lighttpd should use MySQL 5.5 on Solaris 11.3, 5.7 on S12
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 03 Oct 2016 15:32:26 -0700
changeset 7030 496c07261afc
parent 7029 517b31b09adc
child 7031 b228218128c5
24791247 lighttpd should use MySQL 5.5 on Solaris 11.3, 5.7 on S12
components/lighttpd/Makefile
--- a/components/lighttpd/Makefile	Mon Oct 03 16:45:13 2016 -0700
+++ b/components/lighttpd/Makefile	Mon Oct 03 15:32:26 2016 -0700
@@ -58,7 +58,11 @@
 CONFIGURE_OPTIONS +=	--with-openssl
 CONFIGURE_OPTIONS +=	--with-pcre
 CONFIGURE_OPTIONS +=	--with-ldap
+ifeq ($(OS_VERSION), 5.12)
 CONFIGURE_OPTIONS +=	--with-mysql=$(USRDIR)/mysql/5.7/bin/mysql_config
+else
+CONFIGURE_OPTIONS +=	--with-mysql=$(USRDIR)/mysql/5.5/bin/mysql_config
+endif
 CONFIGURE_OPTIONS +=    PCRECONFIG="$(USRBINDIR64)/pcre-config"
 
 COMPONENT_TEST_TRANSFORMS += \
@@ -67,8 +71,13 @@
 	'-e "/.*/d" '
 
 REQUIRED_PACKAGES += compress/bzip2
+ifeq ($(OS_VERSION), 5.12)
 REQUIRED_PACKAGES += database/mysql-57
 REQUIRED_PACKAGES += database/mysql-57/library
+else
+REQUIRED_PACKAGES += database/mysql-55
+REQUIRED_PACKAGES += database/mysql-55/library
+endif
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += library/security/openssl