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

[lblume at users.sourceforge.net]

Revision: 21305
          http://gar.svn.sourceforge.net/gar/?rev=21305&view=rev
Author:   lblume
Date:     2013-06-07 19:18:22 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Reinstate lines inadvertently removed; some bonus cleanup of old lines

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	2013-06-07 16:09:49 UTC (rev 21304)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-06-07 19:18:22 UTC (rev 21305)
@@ -33,7 +33,8 @@
 # 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
+# Solaris 10 needs a special map file since we need libnsl Version 1.9.1
+# and libc 1.22.5
 
 ifneq ($(shell /usr/bin/uname -r),5.9)
 	LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)"
@@ -230,7 +231,6 @@
 # The line below come from the official MySQL build configuration
 CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON"
 CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON"
-CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON"
 CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF"
 CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON"
 CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON"
@@ -246,6 +246,9 @@
 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
@@ -320,8 +323,6 @@
 		--skip-test=archive-big --skip-test=/gis/
 
 configure-custom:
-	#		--debug-output \
-	#		--debug-trycompile \
 	(cd $(WORKSRC) && \
 	 	/usr/bin/env -i \
 		  $(CONFIGURE_ENV) \
@@ -344,16 +345,10 @@
 post-install-modulated:
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d
-	# # Add versions to binary names
-	# for f in $(EXECUTABLES); do \
-	# 	gmv -v "$(DESTDIR)$(bindir)/$${f}" \
-	# 	       "$(DESTDIR)$(bindir)/$${f}"; \
-	# done
 	(cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \
 		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:
@@ -366,7 +361,6 @@
 		$(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW
 	# The quick_start-csw file is almost the same as postinstall.
 	# [ -d $(PKGROOT)$(datadir)/mysql ]
-	# ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql
 	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
 		        $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)

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