Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/python/python26/patches/Python26-03-distutils-pycc.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 04 Mar 2011 13:19:22 -0800
changeset 118 049f3b3d6903
parent 115 c360825c3a3f
permissions -rw-r--r--
7016735 move mercurial from sfw to userland (fix module building)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     1
 
diff --git Python-2.6.4/Lib/distutils/sysconfig.py Python-2.6.4/Lib/distutils/sysconfig.py
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     2
 
--- Python-2.6.4/Lib/distutils/sysconfig.py
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     3
 
+++ Python-2.6.4/Lib/distutils/sysconfig.py
118
049f3b3d6903 7016735 move mercurial from sfw to userland (fix module building)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 115
diff changeset 
     4
 
@@ -166,16 +166,12 @@
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     5
 
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     6
 
                             'CCSHARED', 'LDSHARED', 'SO')
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     7
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     8
 
-        if 'CC' in os.environ:
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     9
 
-            cc = os.environ['CC']
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    10
 
-        if 'CXX' in os.environ:
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    11
 
-            cxx = os.environ['CXX']
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    12
 
-        if 'LDSHARED' in os.environ:
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    13
 
-            ldshared = os.environ['LDSHARED']
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    14
 
-        if 'CPP' in os.environ:
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    15
 
-            cpp = os.environ['CPP']
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    16
 
-        else:
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    17
 
-            cpp = cc + " -E"           # not always
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    18
 
+        # On Solaris, we must always use pycc/pyCC, which will then look up
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    19
 
+        # $CC and $CXX
118
049f3b3d6903 7016735 move mercurial from sfw to userland (fix module building)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 115
diff changeset 
    20
 
+        cc = '/usr/lib/python2.6/pycc'
049f3b3d6903 7016735 move mercurial from sfw to userland (fix module building)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 115
diff changeset 
    21
 
+        cxx = '/usr/lib/python2.6/pyCC'
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    22
 
+        cpp = cc + " -E"
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    23
 
+
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    24
 
         if 'LDFLAGS' in os.environ:
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    25
 
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    26
 
         if 'CFLAGS' in os.environ:
upstream/oracle/userland-gate