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

[dmichelsen at users.sourceforge.net]

Revision: 23871
          http://sourceforge.net/p/gar/code/23871
Author:   dmichelsen
Date:     2014-07-27 16:06:37 +0000 (Sun, 27 Jul 2014)
Log Message:
-----------
scons/trunk: Forward-port patch for 2.3.2

Modified Paths:
--------------
    csw/mgar/pkg/scons/trunk/Makefile
    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-07-27 10:33:37 UTC (rev 23870)
+++ csw/mgar/pkg/scons/trunk/Makefile	2014-07-27 16:06:37 UTC (rev 23871)
@@ -24,7 +24,7 @@
 
 # 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
-# Solaris 10 has different link options, so different packages for SOolaris 9 and 10
+# Solaris 10 has different link options, so different packages for Solaris 9 and 10
 PACKAGING_PLATFORMS += solaris9-sparc
 PACKAGING_PLATFORMS += solaris10-sparc
 

Modified: 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	2014-07-27 10:33:37 UTC (rev 23870)
+++ csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch	2014-07-27 16:06:37 UTC (rev 23871)
@@ -1,6 +1,6 @@
-From feb87c6d43dfb361f771cf4d2ddc456cd8746fef Mon Sep 17 00:00:00 2001
+From fe5c8571c54955c5803eef17671f1e7ca0688050 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 14 Feb 2014 10:14:28 +0100
+Date: Sun, 27 Jul 2014 18:02:04 +0200
 Subject: [PATCH] Solaris 9 ld(1) needs -h for soname
 
 ---
@@ -8,18 +8,18 @@
  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
+index 947b7a5..9ef84f0 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
+@@ -314,7 +314,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,-soname=%s' % soname ]
++                shlink_flags += [ '-Wl,-h%s' % soname ]
+                 if Verbose:
+                     print " soname ",soname,", shlink_flags ",shlink_flags
          elif platform == 'cygwin':
 -- 
-1.8.4.1
+2.0.0
 

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