patches/Python-03-distutils-pycc.diff
author yippi
Thu, 31 May 2012 20:16:52 +0000
changeset 22481 1ff6784d9b6f
parent 8162 ab63e00d2219
permissions -rw-r--r--
2012-05-31 Brian Cameron <[email protected]> * base-specs/shared-mime-info.spec: Bump to 1.0. * base-specs/nautilus.spec, base-specs/pulseaudio.spec, base-specs/gnome-settings-daemon.spec, specs/SUNWdconf.spec: Add patch comments. * base-specs/gnome-panel.spec: Add --disable-telepathy-glib so it does not build with this module we do not deliver.

--- Python-2.4.2/Lib/distutils/sysconfig.py	2005-01-06 15:16:03.000000000 -0800
+++ Python-2.4.2-new/Lib/distutils/sysconfig.py	2006-08-24 05:33:41.133317000 -0700
@@ -149,16 +149,10 @@
         (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext) = \
             get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO')
 
-        if os.environ.has_key('CC'):
-            cc = os.environ['CC']
-        if os.environ.has_key('CXX'):
-            cxx = os.environ['CXX']
-        if os.environ.has_key('LDSHARED'):
-            ldshared = os.environ['LDSHARED']
-        if os.environ.has_key('CPP'):
-            cpp = os.environ['CPP']
-        else:
-            cpp = cc + " -E"           # not always
+        # On Solaris, we must always use pycc/pyCC, which will then look up
+        # $CC and $CXX
+        cpp = cc + " -E"
+
         if os.environ.has_key('LDFLAGS'):
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
         if basecflags: