summaryrefslogtreecommitdiffstats
path: root/package/python/python-010-fix-python-config.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-28 21:54:54 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-02 19:30:25 +0100
commit9badea2d058a75182f2a37bbefa0aaf48020575d (patch)
treebd74cae25f0d4bf0248c9a4a718fd14559a9d640 /package/python/python-010-fix-python-config.patch
parentc24c874810054cb0185807fe797d92056207bbbe (diff)
downloadbuildroot-9badea2d058a75182f2a37bbefa0aaf48020575d.tar.gz
buildroot-9badea2d058a75182f2a37bbefa0aaf48020575d.zip
python: bump to 2.7.9
In addition to doing the bump, this commit also: - Refreshes all the patches - Removes python-003-properly-detect-if-python-build.patch, which has been applied upstream. - Passes the --without-ensurepip option, like is done in Python 3, to avoid having Python use PIP to automatically download stuff when it is being built. - PYTHON_LIBTOOL_PATH = NO is added to prevent Buildroot from trying to patch a version of libtool for which we don't have matching patches, which isn't a problem since we're anyway not using the part of the Python sources that uses libtool (it's the built-in copy of libffi, and we use the external libffi). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'package/python/python-010-fix-python-config.patch')
-rw-r--r--package/python/python-010-fix-python-config.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/package/python/python-010-fix-python-config.patch b/package/python/python-010-fix-python-config.patch
index 97ff157bc2..2beb2333bd 100644
--- a/package/python/python-010-fix-python-config.patch
+++ b/package/python/python-010-fix-python-config.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -879,6 +879,7 @@
+@@ -882,6 +882,7 @@
# Other platforms follow
if test $enable_shared = "yes"; then
@@ -18,7 +18,7 @@ Index: b/configure.ac
AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
case $ac_sys_system in
BeOS*)
-@@ -939,6 +940,7 @@
+@@ -942,6 +943,7 @@
esac
else # shared is disabled
@@ -26,7 +26,7 @@ Index: b/configure.ac
case $ac_sys_system in
CYGWIN*)
BLDLIBRARY='$(LIBRARY)'
-@@ -1915,6 +1917,9 @@
+@@ -1918,6 +1920,9 @@
AC_SUBST(BLDSHARED)
AC_SUBST(CCSHARED)
AC_SUBST(LINKFORSHARED)
@@ -36,8 +36,8 @@ Index: b/configure.ac
# SO is the extension of shared libraries `(including the dot!)
# -- usually .so, .sl on HP-UX, .dll on Cygwin
AC_MSG_CHECKING(SO)
-@@ -4563,7 +4568,7 @@
- AC_MSG_RESULT(done)
+@@ -4581,7 +4586,7 @@
+ AC_SUBST(ENSUREPIP)
# generate output files
-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
@@ -49,7 +49,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@
SUBDIRSTOO= Include Lib Misc Demo
# Files and directories to be distributed
@@ -58,7 +58,7 @@ Index: b/Makefile.pre.in
DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS)
-@@ -407,7 +407,7 @@
+@@ -410,7 +410,7 @@
# Default target
all: build_all
@@ -67,7 +67,7 @@ Index: b/Makefile.pre.in
# Compile a binary with gcc profile guided optimization.
profile-opt:
-@@ -1068,10 +1068,12 @@
+@@ -1101,10 +1101,12 @@
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -82,7 +82,7 @@ Index: b/Makefile.pre.in
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1130,7 +1132,7 @@
+@@ -1163,7 +1165,7 @@
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -91,7 +91,7 @@ Index: b/Makefile.pre.in
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1312,6 +1314,7 @@
+@@ -1345,6 +1347,7 @@
config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform
-rm -rf $(PYTHONFRAMEWORKDIR)
OpenPOWER on IntegriCloud