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

[wahwah at users.sourceforge.net]

Revision: 17405
          http://gar.svn.sourceforge.net/gar/?rev=17405&view=rev
Author:   wahwah
Date:     2012-03-14 17:01:45 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: it builds and packages. cool\!

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

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2012-03-14 16:22:16 UTC (rev 17404)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2012-03-14 17:01:45 UTC (rev 17405)
@@ -12,9 +12,9 @@
 
 PROJ_NAME = mysql
 NAME = $(PROJ_NAME)5
-BASE_VERSION = 5.5
-PATCHLEVEL = 21
-ALTS_PRIO = 55
+BASE_VERSION = 5.6
+PATCHLEVEL = 4-m7
+ALTS_PRIO = 56
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = server
 
@@ -67,7 +67,8 @@
 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
 PATCHFILES += 0003-I-HATE-CMAKE.patch
-PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
+# PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
+PATCHFILES += 0005-Do-not-strip-RPATH-from-binaries.patch
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums	2012-03-14 16:22:16 UTC (rev 17404)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums	2012-03-14 17:01:45 UTC (rev 17405)
@@ -1 +1 @@
-86d6bd335054a0aed1756ed60574c16d  mysql-5.5.21.tar.gz
+3bba56b37faf33c0b9549bab36fb25f3  mysql-5.6.4-m7.tar.gz

Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch	2012-03-14 17:01:45 UTC (rev 17405)
@@ -0,0 +1,27 @@
+From fd25893088c1f89c69e2bf81ee091a258fe99ca5 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 14 Mar 2012 16:47:21 +0100
+Subject: [PATCH] Do not strip RPATH from binaries
+
+---
+ configure.cmake |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/configure.cmake b/configure.cmake
+index bd5c4a4..caf8408 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -57,6 +57,10 @@ ENDIF()
+ # other threads.
+ SET(SIGNAL_WITH_VIO_CLOSE 1)
+ 
++# Don't strip runpath as it breaks the binaries that need libraries in
++# /opt/csw/lib.
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
++
+ # Always enable -Wall for gnu C/C++
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
+-- 
+1.7.9
+

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