components/python/python34/patches/03-setup.patch
author John Beck <John.Beck@Oracle.COM>
Thu, 19 Jun 2014 13:53:07 -0700
changeset 1953 5c1face45dc8
parent 1907 446472de62e9
child 2183 5d00686e81da
permissions -rw-r--r--
19004593 update Python to 3.4.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1907
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch modifies the setup script to support Solaris.
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
As it is Solaris-specific, it is not suitable for upstream.
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
1953
5c1face45dc8 19004593 update Python to 3.4.1
John Beck <John.Beck@Oracle.COM>
parents: 1907
diff changeset
     4
--- Python-3.4.1/setup.py.~2~	2014-05-27 10:58:02.374409887 -0700
5c1face45dc8 19004593 update Python to 3.4.1
John Beck <John.Beck@Oracle.COM>
parents: 1907
diff changeset
     5
+++ Python-3.4.1/setup.py	2014-05-27 10:58:02.415203920 -0700
1907
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
@@ -728,6 +728,13 @@
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
                                                      ['/usr/lib/termcap'],
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
                                                      'termcap'):
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
                 readline_libs.append('termcap')
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
+
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
+            if host_platform == 'sunos5':
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
+                # insert '-zrecord' before the readline libraries that we
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
+                # want to link with to avoid rl_insert() elimination
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
+                readline_extra_link_args = ('-Wl,-zrecord','-lreadline','-lncurses')
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
+                readline_libs = ()
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
+
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
             exts.append( Extension('readline', ['readline.c'],
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    18
                                    library_dirs=['/usr/lib/termcap'],
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    19
                                    extra_link_args=readline_extra_link_args,
1953
5c1face45dc8 19004593 update Python to 3.4.1
John Beck <John.Beck@Oracle.COM>
parents: 1907
diff changeset
    20
@@ -1910,7 +1917,7 @@
1907
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    21
             # this option. If you want to compile ctypes with the Sun
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    22
             # compiler, please research a proper solution, instead of
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    23
             # finding some -z option for the Sun compiler.
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    24
-            extra_link_args.append('-mimpure-text')
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    25
+            pass
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    26
 
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    27
         elif host_platform.startswith('hp-ux'):
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    28
             extra_link_args.append('-fPIC')