[csw-devel] SF.net SVN: gar:[16601] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

[wahwah at users.sourceforge.net]

Revision: 16601
          http://gar.svn.sourceforge.net/gar/?rev=16601&view=rev
Author:   wahwah
Date:     2011-12-27 12:05:21 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: adding arch-related overrides (yes, we build for sparcv8+)

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-12-27 11:41:02 UTC (rev 16600)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-12-27 12:05:21 UTC (rev 16601)
@@ -5,7 +5,11 @@
 # If you are involved in packaging MySQL, consider subscribing to the
 # packagers mailing list:
 # http://lists.mysql.com/packagers
+#
+# About building MySQL with cmake:
+# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide
 
+
 PROJ_NAME = mysql
 NAME = $(PROJ_NAME)55
 BASE_VERSION = 5.5
@@ -56,6 +60,7 @@
 PKGFILES_CSWmysql-dev  += $(prefix)/include.*
 PKGFILES_CSWmysql-dev  += /opt/csw/include/mysql
 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config$(PROGRAM_SUFFIX).1
+CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
 ALTERNATIVES_CSWmysql-dev = mysql_dev
 ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO)
 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\
@@ -112,10 +117,13 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
-# It's intentional. There's a sparcv8-incompatible assembler code there.
-CHECKPKG_OVERRIDES_CSW$(NAME)client_isa-sparcv8plus += binary-architecture-does-not-match-placement
-CHECKPKG_OVERRIDES_CSW$(NAME)client += CHECKPKG_OVERRIDES_CSW$(NAME)client_$(ISA)
 
+# It's intentional. There's a sparcv8-incompatible assembler code there, so we
+# must build for sparcv8+ on Solaris 9.
+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
+
 PACKAGES += CSW$(NAME)
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER)
@@ -333,6 +341,7 @@
 		ln -s libmysqlclient.so.18 libmysqlclient_r.so.18)
 	(cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \
 		ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0)
+	# gmv -vf $(DESTDIR)$(mandir)/man1/mysql_config.1
 	@$(MAKECOOKIE)
 
 post-merge:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.