# HG changeset patch
# User Mike Sullivan <Mike.Sullivan@Oracle.COM>
# Date 1303323397 25200
# Node ID 2785115729b6672bd142cba68a9f1f5b9bd2c9f3
# Parent  770850e7b61c64a66a2ce625f221d756257d1790
7037100 userland pkgdepend seems confused (and fails) on 163
7037894 remove linker core dump workarounds

diff -r 770850e7b61c -r 2785115729b6 components/imagemagick/Makefile
--- a/components/imagemagick/Makefile	Wed Apr 20 10:59:37 2011 -0700
+++ b/components/imagemagick/Makefile	Wed Apr 20 11:16:37 2011 -0700
@@ -57,11 +57,6 @@
 #
 COMPONENT_PRE_CONFIGURE_ACTION= ($(CP) -R $(SOURCE_DIR)/PerlMagick $(@D))
 
-# Studio 12.1 -xO4 + -zignore on sparc causes linker core dump prior to
-# build 163.
-studio_OPT.sparc.32 =	-xO3
-studio_OPT.sparc.64 =	-xO3
-
 # Show name of "error tag" as part of the warning
 #
 CFLAGS+= -errtags
diff -r 770850e7b61c -r 2785115729b6 components/python/python26/patches/ld-zignore_sparc_core_workaround.patch
--- a/components/python/python26/patches/ld-zignore_sparc_core_workaround.patch	Wed Apr 20 10:59:37 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# This patch is to work around a core dump issue when we try to build cStringIO
-# with -zignore in LD_OPTIONS. 
-#
---- Python-2.6.4/setup.pyy	Thu Apr  7 10:38:59 2011
-+++ Python-2.6.4/setup.py	Thu Apr  7 12:04:36 2011
-@@ -235,7 +235,13 @@
-                 return
- 
-         try:
-+            ldo = None
-+	    if ext.name == 'cStringIO' and 'LD_OPTIONS' in os.environ:
-+                ldo = os.environ['LD_OPTIONS']
-+		del os.environ['LD_OPTIONS']
-             build_ext.build_extension(self, ext)
-+            if ldo != None:
-+	        os.environ['LD_OPTIONS'] = ldo
-         except (CCompilerError, DistutilsError), why:
-             self.announce('WARNING: building of extension "%s" failed: %s' %
-                           (ext.name, sys.exc_info()[1]))
diff -r 770850e7b61c -r 2785115729b6 transforms/defaults
--- a/transforms/defaults	Wed Apr 20 10:59:37 2011 -0700
+++ b/transforms/defaults	Wed Apr 20 11:16:37 2011 -0700
@@ -94,6 +94,8 @@
 <transform file -> default mode 0444>
 <transform dir -> default mode 0755>
 
+set name=variant.arch value=$(MACH)
+
 #
 # Defaults for legacy metadata for SVR4 package information
 #