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

[wahwah at users.sourceforge.net]

Revision: 16598
          http://gar.svn.sourceforge.net/gar/?rev=16598&view=rev
Author:   wahwah
Date:     2011-12-23 19:32:14 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Why do you strip runpath, cmake?

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

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-12-23 16:41:37 UTC (rev 16597)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-12-23 19:32:14 UTC (rev 16598)
@@ -64,6 +64,7 @@
 	$(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1)
 
 PATCHFILES += 0003-I-HATE-CMAKE.patch
+PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -103,22 +104,28 @@
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)$(PROGRAM_SUFFIX)\.1)
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX))
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX))
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6
 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)
 
 PACKAGES += CSW$(NAME)
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER)
 SPKG_DESC_CSW$(NAME) = Multithreaded SQL database
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt
-RUNTIME_DEP_PKGS_CSWmysql55 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
 CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
 

Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch	2011-12-23 19:32:14 UTC (rev 16598)
@@ -0,0 +1,28 @@
+From 5d40e65ac43b6b57f53d60a3e2db22a2981dc9ed Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 23 Dec 2011 20:29:18 +0100
+Subject: [PATCH] WHY IS CMAKE TRYING TO BE SMARTER THAN ME?!
+
+When I set -R/opt/csw/lib in CPPFLAGS, I do mean -R/opt/csw/lib, how hard is
+it to understand?
+---
+ configure.cmake |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.cmake b/configure.cmake
+index c3cc787..15d75dc 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -53,6 +53,9 @@ IF(NOT SYSTEM_TYPE)
+   ENDIF()
+ ENDIF()
+ 
++# 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)
+-- 
+1.7.6.1
+

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