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/python34/patches/01-bits.patch
author John Beck <John.Beck@Oracle.COM>
Tue, 22 Dec 2015 07:57:25 -0800
changeset 5229 b7b91ddbbdce
parent 2183 5d00686e81da
permissions -rw-r--r--
22456127 Upgrade Python 3.4 line to 3.4.4
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
 
#
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     2
 
# This patch addresses problems with the configure script.
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     3
 
# 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 
     4
 
#
2183
5d00686e81da 19782913 update Python to 3.4.2
John Beck <John.Beck@Oracle.COM>
parents: 1953
diff changeset 
     5
 
--- Python-3.4.2/configure.ac.~2~	2014-09-22 12:56:55.683506632 -0700
5d00686e81da 19782913 update Python to 3.4.2
John Beck <John.Beck@Oracle.COM>
parents: 1953
diff changeset 
     6
 
+++ Python-3.4.2/configure.ac	2014-09-22 12:56:55.695790952 -0700
1907
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     7
 
@@ -5,7 +5,7 @@
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     8
 
 # Set VERSION so we only need to edit in one place (i.e., here)
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     9
 
 m4_define(PYTHON_VERSION, 3.4)
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
 
-AC_PREREQ(2.65)
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    12
 
+AC_PREREQ(2.68)
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    13
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    14
 
 AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    15
5229
b7b91ddbbdce 22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents: 2183
diff changeset 
    16
 
@@ -2121,12 +2121,6 @@
1907
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    17
 
 if test -z "$CCSHARED"
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    18
 
 then
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    19
 
 	case $ac_sys_system/$ac_sys_release in
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    20
 
-	SunOS*) if test "$GCC" = yes;
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    21
 
-		then CCSHARED="-fPIC";
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    22
 
-		elif test `uname -p` = sparc;
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    23
 
-		then CCSHARED="-xcode=pic32";
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    24
 
-		else CCSHARED="-Kpic";
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    25
 
-		fi;;
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    26
 
 	hp*|HP*) if test "$GCC" = yes;
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    27
 
 		 then CCSHARED="-fPIC";
446472de62e9 PSARC 2014/151 Python 3.4
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    28
 
 		 else CCSHARED="+z";
upstream/oracle/userland-gate