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

[wahwah at users.sourceforge.net]

Revision: 18453
          http://gar.svn.sourceforge.net/gar/?rev=18453&view=rev
Author:   wahwah
Date:     2012-06-19 09:10:47 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: work towards building it with Studio

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	2012-06-19 00:51:42 UTC (rev 18452)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2012-06-19 09:10:47 UTC (rev 18453)
@@ -21,6 +21,8 @@
 # Useful when making a series of builds on the same day
 # GARFLAVOR ?= DBG
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 # 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
@@ -36,9 +38,9 @@
 
 # There are problems with the build using Sun Studio.
 # GARCOMPILER = SOS12
-# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
-# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
-GARCOMPILER = GNU
+EXTRA_CFLAGS += -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+EXTRA_CXXFLAGS += -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+# GARCOMPILER = GNU
 
 INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
 
@@ -209,6 +211,9 @@
 # CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
 CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
+CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)"
+CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
 
 # TODO: Make the tests pass. They don't at the moment.
 SKIPTEST ?= 1

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