e3418f69cf
This commit does a number of changes and improvements to the Python
interpreter package :
* It converts the .mk file to the AUTOTARGETS infrastructure. Even
though Python uses only autoconf and not automake, the AUTOTARGETS
is a fairly good fit for the Python interpreter, so we make use of
it.
* It bumps the version to 2.7.1. As this is a minor release compared
to 2.7, there are no particular changes needed because of this
bump. All changes done to the package are cleanups and improvements
unrelated to the version bump.
* It uses the system libffi. Until now, Python was building its own
libffi (a library used by interprets to build code that makes
function call at runtime). Using the Python internal libffi was not
working as Python was not passing the appropriate arguments down to
libffi ./configure script. And it sounded better to use a
system-wide libffi, that could potentially be used by other
packages as well. This libffi is needed for the ctypes Python
module.
* Remove all "depends on BR2_PACKAGE_PYTHON" by moving all
Python-related options under a "if BR2_PACKAGE_PYTHON ... endif"
condition.
* Make the installation of pre-compiled Python modules (.pyc) the
default, since they are smaller and do not need to be compiled on
the target. It is still possible to install uncompiled modules, or
both the uncompiled and pre-compiled versions.
* The options to select the set of Python modules to compile has been
moved to a submenu.
* The codecscjk (Japanese, Korean and Chinese codecs) module is no
longer enabled by default.
* The commented options for gdbm and nis in Python have been
removed. Those were not supported, so let's get rid of unused code.
* The option for the tkinker module in Python has been removed, since
we don't have a package for Tk in Buildroot.
* Options for the bzip2, sqlite and zlib modules have been added,
since those modules have external dependencies.
* The set of patches has been completely reworked and extended, with
more fine-grained patches and newer functionalities. The patches
are split in two categories:
- Patches that make various modifications to the Python build
system to support cross-compilation or make some minor
modifications. Those patches are numbered from 0 to 100.
- Patches that add configuration options to the Python build
system in order to enable/disable the compilation of Python
extensions or modules (test modules, pydoc, lib2to3, sqlite, tk,
curses, expat, codecs-cjk, nis, unicodedata, database modules,
ssl, bzip2, zlib). These patches are numbered from 100 to 200.
All features of the previous four patches are preserved, but they
are organized differently and the patches have been renamed. This
makes it difficult to see the differences from the existing
patches.
* The host Python interpreter is now installed in $(HOST_DIR), since
it is used to build third party Python modules.
* The BR2_PACKAGE_PYTHON_DEV option is removed since
BR2_HAVE_DEVFILES already does the necessary work.
* The "make -i install" workaround introduced by Maxime Ripard is no
longer needed. It was caused by the compilation of the tests that
required the unicodedata module (which wasn't built in the host
Python interpreter). Since we no longer compile the Python tests,
the problem doesn't exist anymore and we can avoid this "-i"
option.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
77 lines
3.0 KiB
Diff
77 lines
3.0 KiB
Diff
Change the location of pyconfig.h
|
|
|
|
The Python interpreter has a really strange behaviour: at *runtime*,
|
|
it reads a Makefile and a header file named pyconfig.h to get some
|
|
information about the configuration.
|
|
|
|
The Makefile is located in usr/lib/python2.7/config, which is fine
|
|
since this location is kept on the target.
|
|
|
|
However, by default, the pyconfig.h is installed in
|
|
usr/include/python2.7, but we completely remove the usr/include
|
|
directory for the target. Since making an exception just for
|
|
pyconfig.h is annoying, this patch also installs pyconfig.h to
|
|
usr/lib/python2.7/config, and modifies the sysconfig module so that it
|
|
looks in this location instead of usr/include.
|
|
|
|
The pyconfig.h is still kept in usr/include/python2.7, because it is
|
|
needed in the $(STAGING_DIR) when building third-party Python
|
|
extensions that contain C code.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
---
|
|
Lib/distutils/sysconfig.py | 3 ++-
|
|
Lib/sysconfig.py | 2 +-
|
|
Makefile.pre.in | 3 ++-
|
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
Index: Python-2.7.1/Lib/distutils/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.1.orig/Lib/distutils/sysconfig.py
|
|
+++ Python-2.7.1/Lib/distutils/sysconfig.py
|
|
@@ -193,7 +193,8 @@
|
|
else:
|
|
inc_dir = project_base
|
|
else:
|
|
- inc_dir = get_python_inc(plat_specific=1)
|
|
+ lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
|
|
+ inc_dir = os.path.join(lib_dir, "config")
|
|
if get_python_version() < '2.2':
|
|
config_h = 'config.h'
|
|
else:
|
|
Index: Python-2.7.1/Lib/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.1.orig/Lib/sysconfig.py
|
|
+++ Python-2.7.1/Lib/sysconfig.py
|
|
@@ -371,7 +371,7 @@
|
|
else:
|
|
inc_dir = _PROJECT_BASE
|
|
else:
|
|
- inc_dir = get_path('platinclude')
|
|
+ inc_dir = os.path.join(get_path('stdlib'), "config")
|
|
return os.path.join(inc_dir, 'pyconfig.h')
|
|
|
|
def get_scheme_names():
|
|
Index: Python-2.7.1/Makefile.pre.in
|
|
===================================================================
|
|
--- Python-2.7.1.orig/Makefile.pre.in
|
|
+++ Python-2.7.1/Makefile.pre.in
|
|
@@ -967,7 +967,6 @@
|
|
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
|
|
done
|
|
- $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
|
|
|
|
# Install the library and miscellaneous stuff needed for extending/embedding
|
|
# This goes into $(exec_prefix)
|
|
@@ -1001,6 +1000,8 @@
|
|
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
|
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
|
|
+ $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(LIBPL)/pyconfig.h
|
|
+ $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
|
|
$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
|
|
$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
|
|
$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
|