[csw-devel] SF.net SVN: gar:[21394] csw/mgar/pkg/mysql5/branches/mysql-5.6.x
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Tue Jun 25 20:44:22 CEST 2013
Revision: 21394
http://gar.svn.sourceforge.net/gar/?rev=21394&view=rev
Author: lblume
Date: 2013-06-25 18:44:18 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: Remove Solaris 9 support
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-25 15:04:06 UTC (rev 21393)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-25 18:44:18 UTC (rev 21394)
@@ -26,28 +26,14 @@
# Useful when making a series of builds on the same day
# GARFLAVOR ?= DBG
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-# Use newest Sun Studio on Solaris10 to solve problems on Solaris10 x86
-# 64bit build:
-ifneq ($(shell /usr/bin/uname -r),5.9)
- GARCOMPILER = SOS12U3
-endif
+GARCOMPILER = SOS12U3
-# There is some assembler code, which doesn't work on sparcv8, and I don't see
-# an easy way to switch it off.
-ISA_DEFAULT_sparc-5.9 = sparcv8plus
-
# Solaris 10 needs a special map file since we need libnsl Version 1.9.1
# and libc 1.22.5
+LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)"
-ifneq ($(shell /usr/bin/uname -r),5.9)
- LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)"
-endif
-
-
-
DISTNAME = mysql-$(VERSION)
SPKG_SOURCEURL = http://www.mysql.com/
@@ -101,9 +87,7 @@
PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.9 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0
PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -137,19 +121,9 @@
PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name))
PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name))
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0
CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
-# It's intentional. There's a sparcv8-incompatible assembler code there, so we
-# must build for sparcv8+ on Solaris 9.
-ifeq ($(shell /usr/bin/uname -pr),5.9 sparc)
- CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement
- CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement
- CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement
-endif
-
CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry
PACKAGES += CSW$(NAME)
@@ -157,9 +131,7 @@
RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstlport1
-RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0
CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1
@@ -174,12 +146,7 @@
EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.*
EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.*
-# Enable 64 bits, but not for Solaris 9 x86
-BUILD64_5.9_sparc = 1
-BUILD64_5.10_sparc = 1
-BUILD64_5.9_i386 =
-BUILD64_5.10_i386 = 1
-BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH))
+BUILD64 = 1
MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/
MASTER_SITES += http://mysql.skynet.be/Downloads/MySQL-$(BASE_VERSION)/
@@ -256,9 +223,7 @@
CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON"
CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON"
CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF"
-ifneq ($(shell /usr/bin/uname -r),5.9)
CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON"
-endif
USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-06-25 15:04:06 UTC (rev 21393)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-06-25 18:44:18 UTC (rev 21394)
@@ -1 +1 @@
-0314b72fe1698d8e49e039d27523cce7 mysql-5.6.12.tar.gz
+5ff56a4fbb0b0c4e075c6f43ba9d007e mysql-5.6.12.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list