SF.net SVN: gar:[23022] csw/mgar/pkg/scons/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23022
          http://sourceforge.net/p/gar/code/23022
Author:   dmichelsen
Date:     2014-02-14 09:25:42 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
scons/trunk: Add soname patch for Solaris 9

Modified Paths:
--------------
    csw/mgar/pkg/scons/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch

Modified: csw/mgar/pkg/scons/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scons/trunk/Makefile	2014-02-14 07:16:00 UTC (rev 23021)
+++ csw/mgar/pkg/scons/trunk/Makefile	2014-02-14 09:25:42 UTC (rev 23022)
@@ -18,9 +18,15 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES += $(NAME)-$(VERSION).tar.gz
 
+# Linker patch for Solaris 9 only
+PATCHFILES-5.9 += 0001-Solaris-9-ld-1-needs-h-for-soname.patch
+PATCHFILES += $(PATCHFILES-$(GAROSREL))
+
 # We have only one package and that is archall, choose sparc
 # We need libserf on Solaris 9 for subversion and that requires a current scons
-PACKAGING_PLATFORMS = solaris9-sparc
+# Solaris 10 has different link options, so different packages for SOolaris 9 and 10
+PACKAGING_PLATFORMS += solaris9-sparc
+PACKAGING_PLATFORMS += solaris10-sparc
 
 VENDOR_URL = http://www.scons.org/
 

Added: csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch
===================================================================
--- csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch	                        (rev 0)
+++ csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch	2014-02-14 09:25:42 UTC (rev 23022)
@@ -0,0 +1,25 @@
+From feb87c6d43dfb361f771cf4d2ddc456cd8746fef Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 14 Feb 2014 10:14:28 +0100
+Subject: [PATCH] Solaris 9 ld(1) needs -h for soname
+
+---
+ engine/SCons/Tool/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engine/SCons/Tool/__init__.py b/engine/SCons/Tool/__init__.py
+index b12095f..344c934 100644
+--- a/engine/SCons/Tool/__init__.py
++++ b/engine/SCons/Tool/__init__.py
+@@ -306,7 +306,7 @@ symlinks for the platform we are on"""
+             (major, age, revision) = version.split(".")
+             # soname will have only the major version number in it
+             soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
+-            shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
++            shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-h%s' % soname ]
+             if Verbose:
+                 print " soname ",soname,", shlink_flags ",shlink_flags
+         elif platform == 'cygwin':
+-- 
+1.8.4.1
+

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