Skip to content

Commit e495784

Browse files
tshirtmantshirtman
committed
Revert "Updated to python 2.7.3"
This reverts commit 062416d.
1 parent ede34a0 commit e495784

10 files changed

+78
-88
lines changed

‎recipes/hostpython/recipe.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

3-
VERSION_hostpython=2.7.3
3+
VERSION_hostpython=2.7.2
44
URL_hostpython=http://python.org/ftp/python/$VERSION_hostpython/Python-$VERSION_hostpython.tar.bz2
5-
MD5_hostpython=c57477edd6d18bd9eeca2f21add73919
5+
MD5_hostpython=ba7b2f11ffdbf195ee0d111b9455a5bd
66

77
# must be generated ?
88
BUILD_hostpython=$BUILD_PATH/hostpython/$(get_directory $URL_hostpython)

‎recipes/python/patches/Python-2.7.3-xcompile.patch renamed to ‎recipes/python/patches/Python-2.7.2-xcompile.patch

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
1-
diff -r bd97c8a031bc -r 4c98a5e6adb2 Makefile.pre.in
2-
--- a/Makefile.pre.in Sun May 06 23:48:58 2012 -0300
3-
+++ b/Makefile.pre.in Sun May 06 23:49:19 2012 -0300
1+
diff -urN Python-2.7.2/configure ltib/rpm/BUILD/Python-2.7.2/configure
2+
--- Python-2.7.2/configure 2011-06-11 11:46:28.000000000 -0400
3+
+++ ltib/rpm/BUILD/Python-2.7.2/configure 2011-11-14 12:10:41.011373524 -0500
4+
@@ -13673,7 +13673,7 @@
5+
$as_echo_n "(cached) " >&6
6+
else
7+
if test "$cross_compiling" = yes; then :
8+
- ac_cv_have_long_long_format=no
9+
+ ac_cv_have_long_long_format="cross -- assuming yes"
10+
else
11+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12+
/* end confdefs.h. */
13+
@@ -13725,7 +13725,7 @@
14+
$as_echo "$ac_cv_have_long_long_format" >&6; }
15+
fi
16+
17+
-if test "$ac_cv_have_long_long_format" = yes
18+
+if test "$ac_cv_have_long_long_format" != no
19+
then
20+
21+
$as_echo "#define PY_FORMAT_LONG_LONG \"ll\"" >>confdefs.h
22+
diff -urN Python-2.7.2/Makefile.pre.in ltib/rpm/BUILD/Python-2.7.2/Makefile.pre.in
23+
--- Python-2.7.2/Makefile.pre.in 2011-06-11 11:46:26.000000000 -0400
24+
+++ ltib/rpm/BUILD/Python-2.7.2/Makefile.pre.in 2011-11-14 12:10:41.013373444 -0500
425
@@ -182,6 +182,7 @@
526

627
PYTHON= python$(EXE)
@@ -18,7 +39,7 @@ diff -r bd97c8a031bc -r 4c98a5e6adb2 Makefile.pre.in
1839
POBJS= \
1940
Parser/acceler.o \
2041
Parser/grammar1.o \
21-
@@ -408,8 +411,8 @@
42+
@@ -407,8 +410,8 @@
2243
# Build the shared modules
2344
sharedmods: $(BUILDPYTHON)
2445
@case $$MAKEFLAGS in \
@@ -29,7 +50,7 @@ diff -r bd97c8a031bc -r 4c98a5e6adb2 Makefile.pre.in
2950
esac
3051

3152
# Build static library
32-
@@ -543,7 +546,7 @@
53+
@@ -542,7 +545,7 @@
3354
$(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
3455
Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
3556
-@$(INSTALL) -d Include
@@ -38,10 +59,10 @@ diff -r bd97c8a031bc -r 4c98a5e6adb2 Makefile.pre.in
3859
-touch Parser/pgen.stamp
3960

4061
$(PGEN): $(PGENOBJS)
41-
@@ -938,25 +941,25 @@
42-
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
43-
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
44-
fi
62+
@@ -925,26 +928,26 @@
63+
done; \
64+
done
65+
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
4566
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
4667
- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
4768
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -72,7 +93,7 @@ diff -r bd97c8a031bc -r 4c98a5e6adb2 Makefile.pre.in
7293

7394
# Create the PLATDIR source directory, if one wasn't distributed..
7495
$(srcdir)/Lib/$(PLATDIR):
75-
@@ -1062,7 +1065,9 @@
96+
@@ -1049,7 +1052,9 @@
7697
# Install the dynamically loadable modules
7798
# This goes into $(exec_prefix)
7899
sharedinstall: sharedmods
@@ -83,30 +104,9 @@ diff -r bd97c8a031bc -r 4c98a5e6adb2 Makefile.pre.in
83104
--prefix=$(prefix) \
84105
--install-scripts=$(BINDIR) \
85106
--install-platlib=$(DESTSHARED) \
86-
diff -r bd97c8a031bc -r 4c98a5e6adb2 configure
87-
--- a/configure Sun May 06 23:48:58 2012 -0300
88-
+++ b/configure Sun May 06 23:49:19 2012 -0300
89-
@@ -13697,7 +13697,7 @@
90-
$as_echo_n "(cached) " >&6
91-
else
92-
if test "$cross_compiling" = yes; then :
93-
- ac_cv_have_long_long_format=no
94-
+ ac_cv_have_long_long_format="cross -- assuming yes"
95-
else
96-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
97-
/* end confdefs.h. */
98-
@@ -13749,7 +13749,7 @@
99-
$as_echo "$ac_cv_have_long_long_format" >&6; }
100-
fi
101-
102-
-if test "$ac_cv_have_long_long_format" = yes
103-
+if test "$ac_cv_have_long_long_format" != no
104-
then
105-
106-
$as_echo "#define PY_FORMAT_LONG_LONG \"ll\"" >>confdefs.h
107-
diff -r bd97c8a031bc -r 4c98a5e6adb2 setup.py
108-
--- a/setup.py Sun May 06 23:48:58 2012 -0300
109-
+++ b/setup.py Sun May 06 23:49:19 2012 -0300
107+
diff -urN Python-2.7.2/setup.py ltib/rpm/BUILD/Python-2.7.2/setup.py
108+
--- Python-2.7.2/setup.py 2011-06-11 11:46:28.000000000 -0400
109+
+++ ltib/rpm/BUILD/Python-2.7.2/setup.py 2011-11-14 12:13:02.175758583 -0500
110110
@@ -145,6 +145,7 @@
111111
def __init__(self, dist):
112112
build_ext.__init__(self, dist)

‎recipes/python/patches/custom-loader.patch

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
diff -r 9d2a211310b3 -r 3ff3e1e49525 Python/dynload_shlib.c
2-
--- a/Python/dynload_shlib.c Mon May 07 00:04:24 2012 -0300
3-
+++ b/Python/dynload_shlib.c Mon May 07 00:04:47 2012 -0300
1+
--- Python-2.7.2.orig/Python/dynload_shlib.c 2010-05-09 16:46:46.000000000 +0200
2+
+++ Python-2.7.2/Python/dynload_shlib.c 2011-04-20 17:52:12.000000000 +0200
43
@@ -6,6 +6,7 @@
54

65
#include <sys/types.h>
@@ -49,10 +48,9 @@ diff -r 9d2a211310b3 -r 3ff3e1e49525 Python/dynload_shlib.c
4948
if (fp != NULL) {
5049
int i;
5150
struct stat statb;
52-
diff -r 9d2a211310b3 -r 3ff3e1e49525 Python/pythonrun.c
53-
--- a/Python/pythonrun.c Mon May 07 00:04:24 2012 -0300
54-
+++ b/Python/pythonrun.c Mon May 07 00:04:47 2012 -0300
55-
@@ -261,9 +261,13 @@
51+
--- Python-2.7.2.orig/Python/pythonrun.c 2010-10-29 05:45:34.000000000 +0200
52+
+++ Python-2.7.2/Python/pythonrun.c 2011-04-20 17:52:12.000000000 +0200
53+
@@ -254,9 +254,13 @@
5654
_PyGILState_Init(interp, tstate);
5755
#endif /* WITH_THREAD */
5856

‎recipes/python/patches/disable-modules.patch

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
diff -r 4c98a5e6adb2 -r f81b1d60ea1f setup.py
2-
--- a/setup.py Sun May 06 23:49:19 2012 -0300
3-
+++ b/setup.py Sun May 06 23:51:54 2012 -0300
1+
--- Python-2.7.2.orig/setup.py 2010-10-31 17:40:21.000000000 +0100
2+
+++ Python-2.7.2/setup.py 2011-11-27 16:49:36.840204364 +0100
43
@@ -21,7 +21,7 @@
54
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
65

76
# This global variable is used to hold the list of modules to be disabled.
87
-disabled_module_list = []
9-
+disabled_module_list = ['spwd', '_ctypes', 'bz2', 'ossaudiodev', '_curses', '_curses_panel', 'readline', '_locale', '_bsddb', 'gdbm', 'dbm', 'nis', 'linuxaudiodev', 'crypt', '_multiprocessing']
8+
+disabled_module_list = ['spwd', '_ctypes','bz2','ossaudiodev','_curses','_curses_panel','readline','_locale','_bsddb','gdbm','dbm','nis','linuxaudiodev','crypt','_multiprocessing']
109

1110
def add_dir_to_list(dirlist, dir):
1211
"""Add the directory 'dir' to the list 'dirlist' (at the front) if

‎recipes/python/patches/fix-filesystemdefaultencoding.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- Python-2.7.3.orig/Python/bltinmodule.c 2012-03-30 01:44:57.018079845 +0200
2-
+++ Python-2.7.3/Python/bltinmodule.c 2012-03-30 01:45:02.650079649 +0200
1+
--- Python-2.7.2.orig/Python/bltinmodule.c 2012-03-30 01:44:57.018079845 +0200
2+
+++ Python-2.7.2/Python/bltinmodule.c 2012-03-30 01:45:02.650079649 +0200
33
@@ -22,7 +22,7 @@
44
#elif defined(__APPLE__)
55
const char *Py_FileSystemDefaultEncoding = "utf-8";

‎recipes/python/patches/fix-gethostbyaddr.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- Python-2.7.3/Modules/socketmodule.c.orig 2012-01-06 01:40:09.915694810 +0100
2-
+++ Python-2.7.3/Modules/socketmodule.c 2012-01-06 01:40:36.967694486 +0100
1+
--- Python-2.7.2/Modules/socketmodule.c.orig 2012-01-06 01:40:09.915694810 +0100
2+
+++ Python-2.7.2/Modules/socketmodule.c 2012-01-06 01:40:36.967694486 +0100
33
@@ -146,6 +146,9 @@
44
On the other hand, not all Linux versions agree, so there the settings
55
computed by the configure script are needed! */

‎recipes/python/patches/fix-locale.patch

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1-
diff -r f81b1d60ea1f -r b387d0622578 Modules/posixmodule.c
2-
--- a/Modules/posixmodule.c Sun May 06 23:51:54 2012 -0300
3-
+++ b/Modules/posixmodule.c Sun May 06 23:52:11 2012 -0300
4-
@@ -3785,13 +3785,6 @@
1+
--- Python-2.7.2.orig/Modules/pwdmodule.c 2010-08-16 22:30:26.000000000 +0200
2+
+++ Python-2.7.2/Modules/pwdmodule.c 2011-04-20 17:52:12.000000000 +0200
3+
@@ -75,11 +75,7 @@
4+
#endif
5+
SETI(setIndex++, p->pw_uid);
6+
SETI(setIndex++, p->pw_gid);
7+
-#ifdef __VMS
8+
SETS(setIndex++, "");
9+
-#else
10+
- SETS(setIndex++, p->pw_gecos);
11+
-#endif
12+
SETS(setIndex++, p->pw_dir);
13+
SETS(setIndex++, p->pw_shell);
14+
15+
--- Python-2.7.2.orig/Modules/posixmodule.c 2010-11-26 18:35:50.000000000 +0100
16+
+++ Python-2.7.2/Modules/posixmodule.c 2011-04-20 17:52:12.000000000 +0200
17+
@@ -3775,13 +3775,6 @@
518
slave_fd = open(slave_name, O_RDWR | O_NOCTTY); /* open slave */
619
if (slave_fd < 0)
720
return posix_error();
@@ -15,24 +28,8 @@ diff -r f81b1d60ea1f -r b387d0622578 Modules/posixmodule.c
1528
#endif /* HAVE_OPENPTY */
1629

1730
return Py_BuildValue("(ii)", master_fd, slave_fd);
18-
diff -r f81b1d60ea1f -r b387d0622578 Modules/pwdmodule.c
19-
--- a/Modules/pwdmodule.c Sun May 06 23:51:54 2012 -0300
20-
+++ b/Modules/pwdmodule.c Sun May 06 23:52:11 2012 -0300
21-
@@ -75,11 +75,7 @@
22-
#endif
23-
SETI(setIndex++, p->pw_uid);
24-
SETI(setIndex++, p->pw_gid);
25-
-#ifdef __VMS
26-
SETS(setIndex++, "");
27-
-#else
28-
- SETS(setIndex++, p->pw_gecos);
29-
-#endif
30-
SETS(setIndex++, p->pw_dir);
31-
SETS(setIndex++, p->pw_shell);
32-
33-
diff -r f81b1d60ea1f -r b387d0622578 Objects/stringlib/formatter.h
34-
--- a/Objects/stringlib/formatter.h Sun May 06 23:51:54 2012 -0300
35-
+++ b/Objects/stringlib/formatter.h Sun May 06 23:52:11 2012 -0300
31+
--- Python-2.7.2.orig/Objects/stringlib/formatter.h 2010-08-01 12:45:15.000000000 +0200
32+
+++ Python-2.7.2/Objects/stringlib/formatter.h 2011-04-20 17:52:12.000000000 +0200
3633
@@ -639,13 +639,7 @@
3734
get_locale_info(int type, LocaleInfo *locale_info)
3835
{
@@ -48,9 +45,8 @@ diff -r f81b1d60ea1f -r b387d0622578 Objects/stringlib/formatter.h
4845
case LT_DEFAULT_LOCALE:
4946
locale_info->decimal_point = ".";
5047
locale_info->thousands_sep = ",";
51-
diff -r f81b1d60ea1f -r b387d0622578 Objects/stringlib/localeutil.h
52-
--- a/Objects/stringlib/localeutil.h Sun May 06 23:51:54 2012 -0300
53-
+++ b/Objects/stringlib/localeutil.h Sun May 06 23:52:11 2012 -0300
48+
--- Python-2.7.2.orig/Objects/stringlib/localeutil.h 2009-04-22 15:29:05.000000000 +0200
49+
+++ Python-2.7.2/Objects/stringlib/localeutil.h 2011-04-20 17:52:12.000000000 +0200
5450
@@ -202,9 +202,8 @@
5551
Py_ssize_t n_digits,
5652
Py_ssize_t min_width)
@@ -63,9 +59,8 @@ diff -r f81b1d60ea1f -r b387d0622578 Objects/stringlib/localeutil.h
6359

6460
return _Py_InsertThousandsGrouping(buffer, n_buffer, digits, n_digits,
6561
min_width, grouping, thousands_sep);
66-
diff -r f81b1d60ea1f -r b387d0622578 Python/pystrtod.c
67-
--- a/Python/pystrtod.c Sun May 06 23:51:54 2012 -0300
68-
+++ b/Python/pystrtod.c Sun May 06 23:52:11 2012 -0300
62+
--- Python-2.7.2.orig/Python/pystrtod.c 2010-05-09 16:46:46.000000000 +0200
63+
+++ Python-2.7.2/Python/pystrtod.c 2011-04-20 17:52:12.000000000 +0200
6964
@@ -126,7 +126,6 @@
7065
{
7166
char *fail_pos;

‎recipes/python/patches/fix-setup-flags.patch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
diff -r 2e01483f343a -r 0b997d01cabc setup.py
2-
--- a/setup.py Sun May 06 23:52:25 2012 -0300
3-
+++ b/setup.py Mon May 07 00:03:53 2012 -0300
1+
--- Python-2.7.2/setup.py.orig 2012-01-08 15:10:39.867332119 +0100
2+
+++ Python-2.7.2/setup.py 2012-01-08 15:10:45.723331911 +0100
43
@@ -445,6 +445,13 @@
54
'/lib', '/usr/lib',
65
]

‎recipes/python/patches/verbose-compilation.patch

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
diff -r 3ff3e1e49525 -r 88bcecdeac6f Makefile.pre.in
2-
--- a/Makefile.pre.in Mon May 07 00:04:47 2012 -0300
3-
+++ b/Makefile.pre.in Mon May 07 00:07:41 2012 -0300
4-
@@ -411,8 +411,8 @@
1+
--- Python-2.7.2/Makefile.pre.in.orig 2012-01-07 18:25:42.097075564 +0100
2+
+++ Python-2.7.2/Makefile.pre.in 2012-01-07 18:26:03.289074810 +0100
3+
@@ -410,8 +410,8 @@
54
# Build the shared modules
65
sharedmods: $(BUILDPYTHON)
76
@case $$MAKEFLAGS in \

‎recipes/python/recipe.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

3-
VERSION_python=2.7.3
3+
VERSION_python=2.7.2
44
DEPS_python=(hostpython)
55
URL_python=http://python.org/ftp/python/$VERSION_python/Python-$VERSION_python.tar.bz2
6-
MD5_python=c57477edd6d18bd9eeca2f21add73919
6+
MD5_python=ba7b2f11ffdbf195ee0d111b9455a5bd
77

88
# must be generated ?
99
BUILD_python=$BUILD_PATH/python/$(get_directory $URL_python)

0 commit comments

Comments
 (0)