[csw-devel] SF.net SVN: gar:[9986] csw/mgar/pkg/libsigcpp/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9986
          http://gar.svn.sourceforge.net/gar/?rev=9986&view=rev
Author:   dmichelsen
Date:     2010-05-26 12:29:53 +0000 (Wed, 26 May 2010)

Log Message:
-----------
libsigcpp: Add Sun Studio feature patch

Modified Paths:
--------------
    csw/mgar/pkg/libsigcpp/trunk/Makefile
    csw/mgar/pkg/libsigcpp/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch

Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/Makefile	2010-05-26 12:26:13 UTC (rev 9985)
+++ csw/mgar/pkg/libsigcpp/trunk/Makefile	2010-05-26 12:29:53 UTC (rev 9986)
@@ -10,6 +10,8 @@
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+PATCHFILES = 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -36,5 +38,6 @@
 PATH := /opt/csw/gnu:$(PATH)
 
 post-configure-modulated:
+	@# Make sure libtool keeps -norunpath during linking
 	perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libsigcpp/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/checksums	2010-05-26 12:26:13 UTC (rev 9985)
+++ csw/mgar/pkg/libsigcpp/trunk/checksums	2010-05-26 12:29:53 UTC (rev 9986)
@@ -1 +1,2 @@
+9ed819b9adb3e17c536d4749b85c253f  0001-Comment-out-define-as-we-are-on-Sun-Studio.patch
 48afe53ba0e3958f6ac5f072afed1c53  libsigc++-2.2.7.tar.gz

Added: csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch	                        (rev 0)
+++ csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch	2010-05-26 12:29:53 UTC (rev 9986)
@@ -0,0 +1,25 @@
+From db7e603d9531ce0ade0d71479997579d62242534 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 26 May 2010 14:10:20 +0200
+Subject: [PATCH] Comment out define as we are on Sun Studio
+
+---
+ sigc++/signal.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/sigc++/signal.h b/sigc++/signal.h
+index 9e81ed0..c273ce0 100644
+--- a/sigc++/signal.h
++++ b/sigc++/signal.h
+@@ -18,7 +18,7 @@
+   //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
+   //do not allow a typedef to have the same name as a class in the typedef's definition.
+   //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
+-  #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
++  //define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
+ #endif
+ 
+ namespace sigc {
+-- 
+1.7.1
+


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