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/python27/patches/00-bits.patch
author John Beck <John.Beck@Oracle.COM>
Tue, 20 Dec 2016 13:25:44 -0800
changeset 7516 09c933391a1b
parent 6445 0edecb568b2e
permissions -rw-r--r--
25293039 Upgrade Python 2.7 line to 2.7.13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
458
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     1
 
#
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     2
 
# This patch makes the pyconfig.h header file 32/64 bit friendly.
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset 
     3
 
# As it is Solaris-specific, it is not suitable for upstream.
458
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     4
 
#
7516
09c933391a1b 25293039 Upgrade Python 2.7 line to 2.7.13
John Beck <John.Beck@Oracle.COM>
parents: 6445
diff changeset 
     5
 
--- Python-2.7.13/configure.ac.~1~	2016-12-17 12:05:07.000000000 +0000
09c933391a1b 25293039 Upgrade Python 2.7 line to 2.7.13
John Beck <John.Beck@Oracle.COM>
parents: 6445
diff changeset 
     6
 
+++ Python-2.7.13/configure.ac	2016-12-19 08:14:37.701742813 +0000
885
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
     7
 
@@ -5,7 +5,7 @@
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
     8
 
 # Set VERSION so we only need to edit in one place (i.e., here)
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
     9
 
 m4_define(PYTHON_VERSION, 2.7)
458
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    10
885
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
    11
 
-AC_PREREQ(2.65)
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
    12
 
+AC_PREREQ(2.68)
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
    13
2af25a1da825 7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 698
diff changeset 
    14
 
 AC_REVISION($Revision$)
7516
09c933391a1b 25293039 Upgrade Python 2.7 line to 2.7.13
John Beck <John.Beck@Oracle.COM>
parents: 6445
diff changeset 
    15
 
 AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/)
09c933391a1b 25293039 Upgrade Python 2.7 line to 2.7.13
John Beck <John.Beck@Oracle.COM>
parents: 6445
diff changeset 
    16
 
@@ -2273,12 +2273,6 @@
458
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    17
 
 if test -z "$CCSHARED"
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    18
 
 then
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    19
 
 	case $ac_sys_system/$ac_sys_release in
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    20
 
-	SunOS*) if test "$GCC" = yes;
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    21
 
-		then CCSHARED="-fPIC";
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    22
 
-		elif test `uname -p` = sparc;
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    23
 
-		then CCSHARED="-xcode=pic32";
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    24
 
-		else CCSHARED="-Kpic";
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    25
 
-		fi;;
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    26
 
 	hp*|HP*) if test "$GCC" = yes;
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    27
 
 		 then CCSHARED="-fPIC";
2edc011b559e 7004671 Add Python 2.7.1
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    28
 
 		 else CCSHARED="+z";
upstream/oracle/userland-gate