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

[wahwah at users.sourceforge.net]

Revision: 15892
          http://gar.svn.sourceforge.net/gar/?rev=15892&view=rev
Author:   wahwah
Date:     2011-10-09 07:28:39 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.5.x: add a patch to stop cmake from breaking CFLAGS

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

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-10-08 23:24:24 UTC (rev 15891)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-10-09 07:28:39 UTC (rev 15892)
@@ -64,6 +64,7 @@
 # PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
 # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
 # PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
+PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -292,7 +293,7 @@
 
 include gar/category.mk
 
-CFLAGS := $(filter-out -I%,$(CFLAGS))
+# CFLAGS := $(filter-out -I%,$(CFLAGS))
 
 test-custom:
 	alias sh=/usr/bin/bash;                           \

Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch	2011-10-09 07:28:39 UTC (rev 15892)
@@ -0,0 +1,29 @@
+From 813fc9123c5b461d1f06b56c7398f28d56a3f1dd Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 9 Oct 2011 09:25:28 +0200
+Subject: [PATCH] stop cmake from messing with cflags
+
+---
+ cmake/os/SunOS.cmake |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake
+index 3d2b4b8..300d20e 100644
+--- a/cmake/os/SunOS.cmake
++++ b/cmake/os/SunOS.cmake
+@@ -84,12 +84,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4
+   } ")
+   CHECK_C_SOURCE_COMPILES(${SOURCE}  HAVE_SPARC32_TICK)
+   IF(NOT HAVE_SPARC32_TICK)
+-    SET(CMAKE_REQUIRED_FLAGS "-mcpu=v9")
+     CHECK_C_SOURCE_COMPILES(${SOURCE}  HAVE_SPARC32_TICK_WITH_V9)
+     SET(CMAKE_REQUIRED_FLAGS)
+-    IF(HAVE_SPARC32_TICK_WITH_V9)
+-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=v9")
+-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=v9")
+-    ENDIF()
+   ENDIF()
+ ENDIF()
+-- 
+1.7.6.1
+

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