patches/Python-03-distutils-pycc.diff
author lp117937
Mon, 18 Sep 2006 23:09:23 +0000
changeset 8162 ab63e00d2219
permissions -rw-r--r--
2006-09-18 Laszlo (Laca) Peter <[email protected]> Python 64-bit changes, mostly from John.Levon. * patches/Python-01-solaris-lib-dirs.diff: (update) merge for 2.4.3 and fix ssl libdir part so that it uses a 64-bit libdir when built in 64-bit mode * patches/Python-02-pycc.diff: (update) reset IFS correctly; use = not ==; add some hacks at the bottom to use the right gcc options, so 64-bit can build * patches/Python-03-distutils-pycc.diff: force using pycc/pyCC so that CC/CXX/FLAGS/LDFLAGS are picked up from the environment * patches/Python-04-distutils-log.diff: fix log.info commands so that they work when the '%' char appears in a compiler flags * patches/Python-05-isalibs.diff: (new) make .so's be generated as foo.so, 64/foo.so; some really nasty fixes to pyconfig.h: we cannot use the compile-time version of SIZEOF, so we hack them in using _LP64. We use PY_CHECK_SIZEOF to avoid autoconf automatically adding them to pyconfig.h; in the Makefile, make python obey libdir for libpython, but still put the generic stuff in /usr/lib/python2.4 (not /usr/lib/amd64/python2.4...) 2006-09-18 Laszlo (Laca) Peter <[email protected]> * pygtk2.spec: re-enable optimisation as the compiler bug that prevented it has been fixed spec-files/Solaris: 2006-09-18 Laszlo (Laca) Peter <[email protected]> Python 64-bit changes * SUNWPython.spec: added patched 3,4,5 (see ../ChangeLog for defails); build 32-bit and 64-bit versions of python 2.4.3; upgraded to 2.4.3; moved smtpd.py to /usr/demo/python * Solaris.inc: define cxx_optflags64 -- 64-bit c++ compiler flags 2006-09-18 Laszlo (Laca) Peter <[email protected]> * .pkgtoolrc: add ${tarballdirs} to the tarball dir search path so that you can specify additional directories in ~/.pkgtoolrc * SUNWbrltty.spec: delete some unnecessary env variables * SUNWdbus.spec: revert to normal optimisation flags, the build problems were caused by ld(1) bug 6467925 * SUNWevolution-data-server.spec: delete some unnecessary env variables * SUNWevolution-exchange.spec: delete some unnecessary env variables * SUNWevolution-jescs.spec: delete some unnecessary env variables * SUNWevolution-libs.spec: delete some unnecessary env variables * SUNWevolution-webcal.spec: delete some unnecessary env variables * SUNWevolution.spec: delete some unnecessary env variables * SUNWfsexam.spec: delete some unnecessary env variables * SUNWgnome-a11y-gok.spec: delete some unnecessary env variables * SUNWgnome-a11y-libs.spec: delete some unnecessary env variables * SUNWgnome-a11y-reader.spec: delete some unnecessary env variables * SUNWgnome-applets.spec: delete some unnecessary env variables * SUNWgnome-archive-mgr.spec: delete some unnecessary env variables * SUNWgnome-calculator.spec: delete some unnecessary env variables * SUNWgnome-camera.spec: delete some unnecessary env variables * SUNWgnome-cd-burner.spec: delete some unnecessary env variables * SUNWgnome-character-map.spec: delete some unnecessary env variables * SUNWgnome-component.spec: set PERL to /usr/perl5/bin/perl as per CR6454456 * SUNWgnome-config-editor.spec: delete some unnecessary env variables * SUNWgnome-desktop-prefs.spec: delete some unnecessary env variables * SUNWgnome-dialog.spec: delete some unnecessary env variables * SUNWgnome-doc-utils.spec: delete some unnecessary env variables * SUNWgnome-file-mgr.spec: delete some unnecessary env variables * SUNWgnome-games.spec: delete some unnecessary env variables * SUNWgnome-help-viewer.spec: delete some unnecessary env variables * SUNWgnome-img-editor.spec: delete some unnecessary env variables * SUNWgnome-img-viewer.spec: delete some unnecessary env variables * SUNWgnome-keyring-manager.spec: delete some unnecessary env variables * SUNWgnome-libs.spec: delete some unnecessary env variables
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8162
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     1
--- Python-2.4.2/Lib/distutils/sysconfig.py	2005-01-06 15:16:03.000000000 -0800
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     2
+++ Python-2.4.2-new/Lib/distutils/sysconfig.py	2006-08-24 05:33:41.133317000 -0700
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     3
@@ -149,16 +149,10 @@
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     4
         (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext) = \
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     5
             get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO')
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     6
 
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     7
-        if os.environ.has_key('CC'):
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     8
-            cc = os.environ['CC']
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     9
-        if os.environ.has_key('CXX'):
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    10
-            cxx = os.environ['CXX']
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    11
-        if os.environ.has_key('LDSHARED'):
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    12
-            ldshared = os.environ['LDSHARED']
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    13
-        if os.environ.has_key('CPP'):
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    14
-            cpp = os.environ['CPP']
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    15
-        else:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    16
-            cpp = cc + " -E"           # not always
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    17
+        # On Solaris, we must always use pycc/pyCC, which will then look up
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    18
+        # $CC and $CXX
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    19
+        cpp = cc + " -E"
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    20
+
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    21
         if os.environ.has_key('LDFLAGS'):
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    22
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    23
         if basecflags: