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

     1

--- /dev/null	2006-08-24 06:34:26.000000000 -0700

     2

+++ Python-2.4.2-new/pycc	2006-08-24 06:37:41.077704000 -0700

     3

@@ -0,0 +1,156 @@

     4

+#!/bin/ksh

     5

+#

     6

+# Script for running the C/C++ compiler when building python modules

     7

+#

     8

+# CDDL HEADER START

     9

+#

    10

+# The contents of this file are subject to the terms of the

    11

+# Common Development and Distribution License, Version 1.0 only

    12

+# (the "License").  You may not use this file except in compliance

    13

+# with the License.

    14

+#

    15

+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

    16

+# or http://www.opensolaris.org/os/licensing.

    17

+# See the License for the specific language governing permissions

    18

+# and limitations under the License.

    19

+#

    20

+# When distributing Covered Code, include this CDDL HEADER in each

    21

+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.

    22

+# If applicable, add the following below this CDDL HEADER, with the

    23

+# fields enclosed by brackets "[]" replaced with your own identifying

    24

+# information: Portions Copyright [yyyy] [name of copyright owner]

    25

+#

    26

+# CDDL HEADER END

    27

+#

    28

+#

    29

+# Copyright 2004-2005 Sun Microsystems, Inc.  All rights reserved.

    30

+# Use is subject to license terms.

    31

+#

    32

+

    33

+MYNAME=`basename $0`

    34

+

    35

+# name of the compiler executable

    36

+CCEXE='cc'

    37

+# name of the GNU compiler executable

    38

+GCCEXE='gcc'

    39

+# name of the programming language

    40

+CLANG='C'

    41

+# name of the env variable for setting the compiler path

    42

+CVAR='CC'

    43

+

    44

+if [ "x$MYNAME" = xpyCC ]; then

    45

+    CCEXE='CC'

    46

+    GCCEXE='g++'

    47

+    CLANG='C++'

    48

+    CC="$CXX"

    49

+    CVAR='CXX'

    50

+fi

    51

+

    52

+SAVED_IFS="$IFS"

    53

+IFS=:

    54

+

    55

+# check if the CC env variable is set

    56

+if [ "x$CC" != x ]; then

    57

+    case "$CC" in

    58

+	/* )

    59

+	    # $CC is an absolute path name

    60

+            # check if $CC exists

    61

+	    if [ ! -e "$CC" ]; then

    62

+		echo "WARNING: pycc: $CC not found" 1>&2

    63

+		CC=

    64

+	    else

    65

+        # check if $CC is an executable

    66

+		if [ ! -x "$CC" -o ! -f "$CC" ]; then

    67

+		    echo "WARNING: pycc: $CC is not an executable" 1>&2

    68

+		    CC=

    69

+		fi

    70

+	    fi

    71

+	    ;;

    72

+	* )

    73

+	    # try to find $CC in the PATH

    74

+	    NEW_CC=

    75

+	    for dir in $PATH; do

    76

+		if [ -x "$dir/$CC" ]; then

    77

+		    NEW_CC="$dir/$CC"

    78

+		    break

    79

+		fi

    80

+	    done

    81

+	    if [ "x$NEW_CC" = x ]; then

    82

+		echo "WARNING: pycc: $CC not found" 1>&2

    83

+		CC=

    84

+	    else

    85

+		CC="$NEW_CC"

    86

+	    fi

    87

+	    ;;

    88

+    esac

    89

+fi

    90

+

    91

+if [ "x$CC" = x ]; then

    92

+    # Look for the Sun Studio compiler in the PATH

    93

+    for dir in $PATH; do

    94

+	if [ -x "$dir/$CCEXE" ]; then

    95

+	    CC="$dir/$CCEXE"

    96

+	    break

    97

+	fi

    98

+    done

    99

+fi

   100

+

   101

+if [ "x$CC" = x ]; then

   102

+    # Look for gcc in the PATH

   103

+    for dir in $PATH; do

   104

+	if [ -x "$dir/$GCCEXE" ]; then

   105

+	    CC="$dir/$GCCEXE"

   106

+	    break

   107

+	fi

   108

+    done

   109

+fi

   110

+

   111

+if [ "x$CC" = x ]; then

   112

+    # Check for Sun Studio in /opt/SUNWspro (default install location)

   113

+    if [ -x /opt/SUNWspro/bin/$CCEXE ]; then

   114

+	CC=/opt/SUNWspro/bin/$CCEXE

   115

+    fi

   116

+fi

   117

+

   118

+if [ "x$CC" = x ]; then

   119

+    # Check for the GNU compiler in /usr/sfw/bin

   120

+    if [ -x /usr/sfw/bin/$GCCEXE ]; then

   121

+	CC=/usr/sfw/bin/$GCCEXE

   122

+    fi

   123

+fi

   124

+

   125

+if [ "x$CC" = x ]; then

   126

+    # Cannot continue without a C compiler

   127

+    echo "ERROR: no $CLANG compiler not found; update your PATH or set the $CVAR env variable" 1>&2

   128

+    exit 1

   129

+fi

   130

+

   131

+IFS="$SAVED_IFS"

   132

+

   133

+# We need to make some modifications to adapt correctly to compiler options

   134

+# that differ between GCC and Studio.

   135

+

   136

+extra_flags=

   137

+

   138

+is_gcc=no

   139

+

   140

+$CC --version >/dev/null 2>&1 && is_gcc=yes

   141

+

   142

+if [ "$is_gcc" = yes ]; then

   143

+	for flag in "${@}"; do

   144

+		# need -shared to link shared objects properly

   145

+		if [ "$flag" = "-G" ]; then

   146

+			extra_flags="$extra_flags -shared"

   147

+		fi

   148

+		# workaround for 6223255

   149

+		if [ "$flag" = "-m64" ]; then

   150

+			extra_flags="$extra_flags -R/usr/sfw/lib/amd64"

   151

+		fi

   152

+	done

   153

+	# force PIC compilation

   154

+	extra_flags="$extra_flags -fPIC -DPIC"

   155

+else

   156

+	extra_flags="$extra_flags -KPIC"

   157

+fi

   158

+

   159

+exec "$CC" $extra_flags "${@}"