jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Python, update to Python-2.6.6, rework & cleanup, remove config/options.python file (will be not more used)

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-10-19 20:21:38 +02:00
parent 7f5b5bcb39
commit 1f5f3dea44
11 changed files with 397 additions and 22578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/options.python
View File

@ -1,14 +0,0 @@
PYTHON_DIR="`ls -d $ROOT/$BUILD/Python*`"
PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`"
PYTHON_INCDIR="`ls -d $SYSROOT_PREFIX/usr/include/python*`"
PYTHON_TOOLCHAIN_PATH=`ls -d $PYTHON_LIBDIR/site-packages`
PYTHON_SYSROOT_PATH=$PYTHON_TOOLCHAIN_PATH
PYTHON_IMAGE_DIR="`ls -d $BUILD/image/system/usr/lib/python* || true`"
PYTHON_IMAGE_PATH=`ls -d $PYTHON_IMAGE_DIR/site-packages || true`
export PYTHON="$ROOT/$TOOLCHAIN/bin/python"
export LDSHARED="$CC -shared"
export ac_cv_path_PYTHON=$PYTHON
export PYTHONPATH="$PYTHON_TOOLCHAIN_PATH:$PYTHON_SYSROOT_PATH:$PYTHON_IMAGE_PATH"

80
packages/lang/Python/build
View File

@ -4,48 +4,46 @@
$SCRIPTS/build toolchain $SCRIPTS/build toolchain
$SCRIPTS/build sqlite $SCRIPTS/build sqlite
$SCRIPTS/build expat
$SCRIPTS/build openssl $SCRIPTS/build openssl
$SCRIPTS/build zlib $SCRIPTS/build zlib
$SCRIPTS/build libffi $SCRIPTS/build libffi
PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
PY_BUILD_DIR=`ls -d $ROOT/$PKG_BUILD`
PY_BASE_VERSION=2.6
cd $PKG_BUILD cd $PKG_BUILD
mkdir -p .objdir-host
cd .objdir-host
setup_toolchain host setup_toolchain host
rm -rf config.cache
CONFIG_SITE= \
OPT="$HOST_CFLAGS" \ OPT="$HOST_CFLAGS" \
./configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --prefix=$ROOT/$TOOLCHAIN \
--without-cxx-main \ --without-cxx-main \
--with-threads \ --with-threads \
--enable-unicode=ucs4 \ --enable-unicode=ucs4 \
OPT="$HOST_CFLAGS" \ make
make -j1 python Parser/pgen make install
OPT="$HOST_CFLAGS" \ cp Parser/pgen ./hostpgen
PYTHON_MODULES_INCLUDE=/usr/include \
PYTHON_MODULES_LIB="/lib /lib64 /usr/lib /usr/lib64" \
make HOSTPYTHON=./python sharedmods install
mv Parser/pgen ./hostpgen
cp python ./hostpython cp python ./hostpython
make distclean cd ..
mkdir -p .objdir-target
cd .objdir-target
setup_toolchain target setup_toolchain target
ac_cv_file__dev_ptmx=no \ ac_cv_file_dev_ptc=no \
ac_cv_file__dev_ptc=no \ ac_cv_file_dev_ptmx=yes \
ac_cv_lib_readline_readline=no \ ac_cv_func_lchflags_works=no \
ac_cv_printf_zd_format=no \ ac_cv_func_chflags_works=no \
ac_cv_func_printf_zd=yes
OPT="$CFLAGS -fno-strict-aliasing" \ OPT="$CFLAGS -fno-strict-aliasing" \
./configure --host=$TARGET_NAME \ ../configure --host=$TARGET_NAME \
--build=$HOST_NAME \ --build=$HOST_NAME \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
@ -63,32 +61,32 @@ OPT="$CFLAGS -fno-strict-aliasing" \
--without-cxx-main \ --without-cxx-main \
--with-system-ffi \ --with-system-ffi \
make -j1 CC=$TARGET_CC \ make -j1 CC="$TARGET_CC" \
GNU_HOST=$TARGET_NAME \ HOSTPYTHON=../.objdir-host/hostpython \
GNU_BUILD=$HOST_NAME \ HOSTPGEN=../.objdir-host/hostpgen \
DESTDIR=$SYSROOT_PREFIX \ BLDSHARED="$CC -shared" \
CROSS_COMPILE=yes \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
PYTHON_MODULES_INCLUDE=$SYSROOT_PREFIX/usr/include \ CROSS_COMPILE="$TARGET_NAME" \
PYTHON_MODULES_LIB="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib" \ CROSS_COMPILE_TARGET="yes"
HOSTPYTHON=./hostpython \
HOSTPGEN=./hostpgen
make CC=$TARGET_CC \ make -j1 CC="$TARGET_CC" \
GNU_HOST=$TARGET_NAME \
GNU_BUILD=$HOST_NAME \
DESTDIR=$SYSROOT_PREFIX \ DESTDIR=$SYSROOT_PREFIX \
CROSS_COMPILE=yes \ HOSTPYTHON=../.objdir-host/hostpython \
HOSTPGEN=../.objdir-host/hostpgen \
BLDSHARED="$CC -shared" \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
PYTHON_MODULES_INCLUDE=$SYSROOT_PREFIX/usr/include \ CROSS_COMPILE="$TARGET_NAME" \
PYTHON_MODULES_LIB="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib" \ CROSS_COMPILE_TARGET="yes" \
HOSTPYTHON=./hostpython \
HOSTPGEN=./hostpgen \
install install
$STRIP python cp -R ../Lib ./
$ROOT/$TOOLCHAIN/bin/python -Wi -t ./Lib/compileall.py -f -x test ./Lib
$ROOT/$TOOLCHAIN/bin/python -Wi -t Lib/compileall.py -f -x test ./Lib # replace python-config to make sure python uses $SYSROOT_PREFIX
mkdir -p $ROOT/$TOOLCHAIN/bin
rm -rf $ROOT/$TOOLCHAIN/bin/python*-config
# ugly hack to fix some issues with crosscompile: sed -e "s:%PREFIX%:$SYSROOT_PREFIX/usr:g" -e "s:%CFLAGS%:$TARGET_CFLAGS:g" \
cp pyconfig.h $ROOT/$TOOLCHAIN/include/python*/ $ROOT/$PKG_DIR/scripts/python-config > $ROOT/$TOOLCHAIN/bin/python2.6-config
chmod +x $ROOT/$TOOLCHAIN/bin/python2.6-config
ln -s python2.6-config $ROOT/$TOOLCHAIN/bin/python-config

65
packages/lang/Python/install
View File

@ -11,50 +11,49 @@ PYTHON_VERSION=2.6
PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/python $INSTALL/usr/bin/ cp $PKG_BUILD/.objdir-target/python $INSTALL/usr/bin/
$STRIP $INSTALL/usr/bin/python
mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/libpython2.6.so.1.0 $INSTALL/usr/lib/ cp -PR $PKG_BUILD/.objdir-target/libpython2.6.so.1.0 $INSTALL/usr/lib/
ln -sf libpython2.6.so.1.0 $INSTALL/usr/lib/libpython2.6.so ln -sf libpython2.6.so.1.0 $INSTALL/usr/lib/libpython2.6.so
mkdir -p $PYTHON_LIB_DIR/lib-dynload mkdir -p $PYTHON_LIB_DIR/lib-dynload
cp $PKG_BUILD/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload cp $PKG_BUILD/.objdir-target/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload
cp $PKG_BUILD/Lib/*.pyc $PYTHON_LIB_DIR cp $PKG_BUILD/.objdir-target/Lib/*.pyc $PYTHON_LIB_DIR
cp $PKG_BUILD/Lib/site.py $PYTHON_LIB_DIR cp $PKG_BUILD/.objdir-target/Lib/site.py $PYTHON_LIB_DIR
cp $PKG_BUILD/Lib/doctest.py $PYTHON_LIB_DIR cp $PKG_BUILD/.objdir-target/Lib/doctest.py $PYTHON_LIB_DIR
cp $PKG_BUILD/Lib/unittest.py $PYTHON_LIB_DIR cp $PKG_BUILD/.objdir-target/Lib/unittest.py $PYTHON_LIB_DIR
mkdir -p $PYTHON_LIB_DIR/plat-linux2 mkdir -p $PYTHON_LIB_DIR/plat-linux2
cp $PKG_BUILD/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2 cp $PKG_BUILD/.objdir-target/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2
mkdir -p $PYTHON_LIB_DIR/json mkdir -p $PYTHON_LIB_DIR/json
cp $PKG_BUILD/Lib/json/*.pyc $PYTHON_LIB_DIR/json cp $PKG_BUILD/.objdir-target/Lib/json/*.pyc $PYTHON_LIB_DIR/json
mkdir -p $PYTHON_LIB_DIR/xml mkdir -p $PYTHON_LIB_DIR/xml
cp $PKG_BUILD/Lib/xml/*.pyc $PYTHON_LIB_DIR/xml cp $PKG_BUILD/.objdir-target/Lib/xml/*.pyc $PYTHON_LIB_DIR/xml
mkdir -p $PYTHON_LIB_DIR/xml/dom mkdir -p $PYTHON_LIB_DIR/xml/dom
cp $PKG_BUILD/Lib/xml/dom/*.pyc $PYTHON_LIB_DIR/xml/dom cp $PKG_BUILD/.objdir-target/Lib/xml/dom/*.pyc $PYTHON_LIB_DIR/xml/dom
mkdir -p $PYTHON_LIB_DIR/xml/parsers mkdir -p $PYTHON_LIB_DIR/xml/parsers
cp $PKG_BUILD/Lib/xml/parsers/*.pyc $PYTHON_LIB_DIR/xml/parsers cp $PKG_BUILD/.objdir-target/Lib/xml/parsers/*.pyc $PYTHON_LIB_DIR/xml/parsers
mkdir -p $PYTHON_LIB_DIR/xml/sax mkdir -p $PYTHON_LIB_DIR/xml/sax
cp $PKG_BUILD/Lib/xml/sax/*.pyc $PYTHON_LIB_DIR/xml/sax cp $PKG_BUILD/.objdir-target/Lib/xml/sax/*.pyc $PYTHON_LIB_DIR/xml/sax
mkdir -p $PYTHON_LIB_DIR/encodings mkdir -p $PYTHON_LIB_DIR/encodings
cp $PKG_BUILD/Lib/encodings/*.pyc $PYTHON_LIB_DIR/encodings cp $PKG_BUILD/.objdir-target/Lib/encodings/*.pyc $PYTHON_LIB_DIR/encodings
mkdir -p $PYTHON_LIB_DIR/logging mkdir -p $PYTHON_LIB_DIR/logging
cp $PKG_BUILD/Lib/logging/*.pyc $PYTHON_LIB_DIR/logging cp $PKG_BUILD/.objdir-target/Lib/logging/*.pyc $PYTHON_LIB_DIR/logging
mkdir -p $PYTHON_LIB_DIR/distutils mkdir -p $PYTHON_LIB_DIR/distutils
cp $PKG_BUILD/Lib/distutils/*.pyc $PYTHON_LIB_DIR/distutils cp $PKG_BUILD/.objdir-target/Lib/distutils/*.pyc $PYTHON_LIB_DIR/distutils
mkdir -p $PYTHON_LIB_DIR/distutils/command mkdir -p $PYTHON_LIB_DIR/distutils/command
cp $PKG_BUILD/Lib/distutils/command/*.pyc $PYTHON_LIB_DIR/distutils/command cp $PKG_BUILD/.objdir-target/Lib/distutils/command/*.pyc $PYTHON_LIB_DIR/distutils/command
# For future 3rd-parties Python modules # For future 3rd-parties Python modules
mkdir -p $PYTHON_LIB_DIR/site-packages mkdir -p $PYTHON_LIB_DIR/site-packages
@ -62,47 +61,47 @@ mkdir -p $PYTHON_LIB_DIR/site-packages
### for test ### ### for test ###
#mkdir -p $PYTHON_LIB_DIR/bsddb #mkdir -p $PYTHON_LIB_DIR/bsddb
# cp $PKG_BUILD/Lib/bsddb/*.pyc $PYTHON_LIB_DIR/bsddb # cp $PKG_BUILD/.objdir-target/Lib/bsddb/*.pyc $PYTHON_LIB_DIR/bsddb
mkdir -p $PYTHON_LIB_DIR/compiler mkdir -p $PYTHON_LIB_DIR/compiler
cp $PKG_BUILD/Lib/compiler/*.pyc $PYTHON_LIB_DIR/compiler cp $PKG_BUILD/.objdir-target/Lib/compiler/*.pyc $PYTHON_LIB_DIR/compiler
mkdir -p $PYTHON_LIB_DIR/ctypes mkdir -p $PYTHON_LIB_DIR/ctypes
cp $PKG_BUILD/Lib/ctypes/*.pyc $PYTHON_LIB_DIR/ctypes cp $PKG_BUILD/.objdir-target/Lib/ctypes/*.pyc $PYTHON_LIB_DIR/ctypes
mkdir -p $PYTHON_LIB_DIR/ctypes/macholib mkdir -p $PYTHON_LIB_DIR/ctypes/macholib
cp $PKG_BUILD/Lib/ctypes/macholib/*.pyc $PYTHON_LIB_DIR/ctypes/macholib cp $PKG_BUILD/.objdir-target/Lib/ctypes/macholib/*.pyc $PYTHON_LIB_DIR/ctypes/macholib
#mkdir -p $PYTHON_LIB_DIR/curses #mkdir -p $PYTHON_LIB_DIR/curses
# cp $PKG_BUILD/Lib/curses/*.pyc $PYTHON_LIB_DIR/curses # cp $PKG_BUILD/.objdir-target/Lib/curses/*.pyc $PYTHON_LIB_DIR/curses
mkdir -p $PYTHON_LIB_DIR/email mkdir -p $PYTHON_LIB_DIR/email
cp $PKG_BUILD/Lib/email/*.pyc $PYTHON_LIB_DIR/email cp $PKG_BUILD/.objdir-target/Lib/email/*.pyc $PYTHON_LIB_DIR/email
mkdir -p $PYTHON_LIB_DIR/email/mime mkdir -p $PYTHON_LIB_DIR/email/mime
cp $PKG_BUILD/Lib/email/mime/*.pyc $PYTHON_LIB_DIR/email/mime cp $PKG_BUILD/.objdir-target/Lib/email/mime/*.pyc $PYTHON_LIB_DIR/email/mime
mkdir -p $PYTHON_LIB_DIR/hotshot mkdir -p $PYTHON_LIB_DIR/hotshot
cp $PKG_BUILD/Lib/hotshot/*.pyc $PYTHON_LIB_DIR/hotshot cp $PKG_BUILD/.objdir-target/Lib/hotshot/*.pyc $PYTHON_LIB_DIR/hotshot
mkdir -p $PYTHON_LIB_DIR/idlelib mkdir -p $PYTHON_LIB_DIR/idlelib
cp $PKG_BUILD/Lib/idlelib/*.pyc $PYTHON_LIB_DIR/idlelib cp $PKG_BUILD/.objdir-target/Lib/idlelib/*.pyc $PYTHON_LIB_DIR/idlelib
#mkdir -p $PYTHON_LIB_DIR/lib-tk #mkdir -p $PYTHON_LIB_DIR/lib-tk
# cp $PKG_BUILD/Lib/lib-tk/*.pyc $PYTHON_LIB_DIR/lib-tk # cp $PKG_BUILD/.objdir-target/Lib/lib-tk/*.pyc $PYTHON_LIB_DIR/lib-tk
#mkdir -p $PYTHON_LIB_DIR/msilib #mkdir -p $PYTHON_LIB_DIR/msilib
# cp $PKG_BUILD/Lib/msilib/*.pyc $PYTHON_LIB_DIR/msilib # cp $PKG_BUILD/.objdir-target/Lib/msilib/*.pyc $PYTHON_LIB_DIR/msilib
mkdir -p $PYTHON_LIB_DIR/multiprocessing mkdir -p $PYTHON_LIB_DIR/multiprocessing
cp $PKG_BUILD/Lib/multiprocessing/*.pyc $PYTHON_LIB_DIR/multiprocessing cp $PKG_BUILD/.objdir-target/Lib/multiprocessing/*.pyc $PYTHON_LIB_DIR/multiprocessing
# not needed, we have pysqlite2 # not needed, we have pysqlite2
mkdir -p $PYTHON_LIB_DIR/sqlite3 mkdir -p $PYTHON_LIB_DIR/sqlite3
cp $PKG_BUILD/Lib/sqlite3/*.pyc $PYTHON_LIB_DIR/sqlite3 cp $PKG_BUILD/.objdir-target/Lib/sqlite3/*.pyc $PYTHON_LIB_DIR/sqlite3
#mkdir -p $PYTHON_LIB_DIR/wsgiref #mkdir -p $PYTHON_LIB_DIR/wsgiref
# cp $PKG_BUILD/Lib/wsgiref/*.pyc $PYTHON_LIB_DIR/wsgiref # cp $PKG_BUILD/.objdir-target/Lib/wsgiref/*.pyc $PYTHON_LIB_DIR/wsgiref
mkdir -p $PYTHON_LIB_DIR/xml/etree mkdir -p $PYTHON_LIB_DIR/xml/etree
cp $PKG_BUILD/Lib/xml/etree/*.pyc $PYTHON_LIB_DIR/xml/etree cp $PKG_BUILD/.objdir-target/Lib/xml/etree/*.pyc $PYTHON_LIB_DIR/xml/etree

107
packages/lang/Python/patches/000-cross-compile-python-2.6.1-0.1.diff
View File

@ -1,107 +0,0 @@
diff -Naur Python-2.6.1/Makefile.pre.in Python-2.6.1.patch/Makefile.pre.in
--- Python-2.6.1/Makefile.pre.in 2008-10-21 18:48:37.000000000 +0200
+++ Python-2.6.1.patch/Makefile.pre.in 2009-02-17 13:37:46.000000000 +0100
@@ -175,6 +175,7 @@
PYTHON= python$(EXE)
BUILDPYTHON= python$(BUILDEXE)
+HOSTPYTHON= $(BUILDPYTHON)
# The task to run while instrument when building the profile-opt target
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
@@ -205,6 +206,7 @@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
+HOSTPGEN= $(PGEN)$(EXE)
POBJS= \
Parser/acceler.o \
@@ -394,8 +396,8 @@
# Build the shared modules
sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \
- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CONFIG_ARGS="$(CONFIG_ARGS)" $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CONFIG_ARGS="$(CONFIG_ARGS)" $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
esac
# Build static library
@@ -513,7 +515,7 @@
$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-@$(INSTALL) -d Include
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
$(PGEN): $(PGENOBJS)
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
@@ -993,7 +995,7 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall:
- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
diff -Naur Python-2.6.1/setup.py Python-2.6.1.patch/setup.py
--- Python-2.6.1/setup.py 2008-11-04 21:43:31.000000000 +0100
+++ Python-2.6.1.patch/setup.py 2009-02-17 13:39:46.000000000 +0100
@@ -273,6 +273,7 @@
try:
imp.load_dynamic(ext.name, ext_filename)
except ImportError, why:
+ return
self.failed.append(ext.name)
self.announce('*** WARNING: renaming "%s" since importing it'
' failed: %s' % (ext.name, why), level=3)
@@ -310,8 +311,18 @@
def detect_modules(self):
# Ensure that /usr/local is always used
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ try:
+ modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split()
+ except KeyError:
+ modules_include_dirs = ['/usr/include']
+ try:
+ modules_lib_dirs = os.environ["PYTHON_MODULES_LIB"].split()
+ except KeyError:
+ modules_lib_dirs = ['/usr/lib']
+ for dir in modules_include_dirs:
+ add_dir_to_list(self.compiler.include_dirs, dir)
+ for dir in modules_lib_dirs:
+ add_dir_to_list(self.compiler.library_dirs, dir)
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -347,12 +358,6 @@
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
- if os.path.normpath(sys.prefix) != '/usr':
- add_dir_to_list(self.compiler.library_dirs,
- sysconfig.get_config_var("LIBDIR"))
- add_dir_to_list(self.compiler.include_dirs,
- sysconfig.get_config_var("INCLUDEDIR"))
-
try:
have_unicode = unicode
except NameError:
@@ -361,11 +366,8 @@
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
- lib_dirs = self.compiler.library_dirs + [
- '/lib64', '/usr/lib64',
- '/lib', '/usr/lib',
- ]
- inc_dirs = self.compiler.include_dirs + ['/usr/include']
+ lib_dirs = self.compiler.library_dirs
+ inc_dirs = self.compiler.include_dirs
exts = []
missing = []

22305
packages/lang/Python/patches/002-configure-python-2.6.2-0.6.diff
View File

File diff suppressed because it is too large Load Diff

17
packages/lang/Python/patches/020-gentoo_py_dontcompile-2.6.1.diff
View File

@ -1,17 +0,0 @@
diff -Naur Python-2.6.1/Python/import.c Python-2.6.1.patch/Python/import.c
--- Python-2.6.1/Python/import.c 2008-09-01 16:18:30.000000000 +0200
+++ Python-2.6.1.patch/Python/import.c 2009-02-17 18:57:55.000000000 +0100
@@ -880,8 +880,12 @@
FILE *fp;
time_t mtime = srcstat->st_mtime;
mode_t mode = srcstat->st_mode;
-
+ char *py_dontcompile = getenv("PYTHON_DONTCOMPILE");
+
+ if (!py_dontcompile)
fp = open_exclusive(cpathname, mode);
+ else
+ fp = NULL;
if (fp == NULL) {
if (Py_VerboseFlag)
PySys_WriteStderr(

28
packages/lang/Python/patches/040-dont_make_pyc-2.6.1.diff
View File

@ -1,28 +0,0 @@
diff -Naur Python-2.6.1/Makefile.pre.in Python-2.6.1.patch/Makefile.pre.in
--- Python-2.6.1/Makefile.pre.in 2009-02-15 02:16:53.000000000 +0100
+++ Python-2.6.1.patch/Makefile.pre.in 2009-02-15 02:31:56.000000000 +0100
@@ -878,24 +878,6 @@
done; \
done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
# Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR):

13
packages/lang/Python/patches/050-crosscompile_modules-python-2.6.1-0.2.diff
View File

@ -1,13 +0,0 @@
diff -Naur Python-2.6.1/setup.py Python-2.6.1.patch/setup.py
--- Python-2.6.1/setup.py 2008-11-04 21:43:31.000000000 +0100
+++ Python-2.6.1.patch/setup.py 2009-02-20 21:29:21.000000000 +0100
@@ -1668,7 +1668,8 @@
ffi_configfile):
from distutils.dir_util import mkpath
mkpath(ffi_builddir)
- config_args = []
+ config_args = ['--host=%s' % os.environ.get('GNU_HOST'),
+ '--build=%s' % os.environ.get('GNU_BUILD')]
# Pass empty CFLAGS because we'll just append the resulting
# CFLAGS to Python's; -g or -O2 is to be avoided.

294
packages/lang/Python/patches/Python-2.6.6-xcompile.diff Normal file
View File

@ -0,0 +1,294 @@
diff -u Python-2.6.6_orig/configure Python-2.6.6/configure
--- Python-2.6.6_orig/configure 2010-05-24 22:27:03.000000000 -0400
+++ Python-2.6.6/configure 2010-09-18 11:10:35.127976185 -0400
@@ -12760,12 +12760,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5
$as_echo_n "checking for %zd printf() format support... " >&6; }
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
+#if test "$cross_compiling" = yes; then :
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+#as_fn_error "cannot run test program while cross compiling
+#See \`config.log' for more details." "$LINENO" 5; }
+#else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -12815,7 +12815,7 @@
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+#fi
ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
diff -u Python-2.6.6_orig/configure.in Python-2.6.6/configure.in
--- Python-2.6.6_orig/configure.in 2010-05-24 22:27:03.000000000 -0400
+++ Python-2.6.6/configure.in 2010-09-18 11:34:37.583770305 -0400
@@ -3860,48 +3860,48 @@
AC_MSG_RESULT(no)
fi
-AC_MSG_CHECKING(for %zd printf() format support)
-AC_TRY_RUN([#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SSIZE_T
-typedef ssize_t Py_ssize_t;
-#elif SIZEOF_VOID_P == SIZEOF_LONG
-typedef long Py_ssize_t;
-#else
-typedef int Py_ssize_t;
-#endif
-
-int main()
-{
- char buffer[256];
-
- if(sprintf(buffer, "%zd", (size_t)123) < 0)
- return 1;
-
- if (strcmp(buffer, "123"))
- return 1;
-
- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
- return 1;
-
- if (strcmp(buffer, "-123"))
- return 1;
-
- return 0;
-}],
-[AC_MSG_RESULT(yes)
- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
- AC_MSG_RESULT(no))
+#AC_MSG_CHECKING(for %zd printf() format support)
+#AC_TRY_RUN([#include <stdio.h>
+##include <stddef.h>
+##include <string.h>
+#
+##ifdef HAVE_SYS_TYPES_H
+##include <sys/types.h>
+##endif
+#
+##ifdef HAVE_SSIZE_T
+#typedef ssize_t Py_ssize_t;
+##elif SIZEOF_VOID_P == SIZEOF_LONG
+#typedef long Py_ssize_t;
+##else
+#typedef int Py_ssize_t;
+##endif
+#
+#int main()
+#{
+# char buffer[256];
+#
+# if(sprintf(buffer, "%zd", (size_t)123) < 0)
+# return 1;
+#
+# if (strcmp(buffer, "123"))
+# return 1;
+#
+# if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
+# return 1;
+#
+# if (strcmp(buffer, "-123"))
+# return 1;
+#
+# return 0;
+#}],
+#[AC_MSG_RESULT(yes)
+# AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
+# AC_MSG_RESULT(no))
AC_CHECK_TYPE(socklen_t,,
AC_DEFINE(socklen_t,int,
- Define to `int' if <sys/socket.h> does not define.),[
+ Define to 'int' if <sys/socket.h> does not define.),[
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
diff -u Python-2.6.6_orig/Makefile.pre.in Python-2.6.6/Makefile.pre.in
--- Python-2.6.6_orig/Makefile.pre.in 2010-08-01 18:05:31.000000000 -0400
+++ Python-2.6.6/Makefile.pre.in 2010-09-18 11:21:40.171999625 -0400
@@ -175,6 +175,7 @@
PYTHON= python$(EXE)
BUILDPYTHON= python$(BUILDEXE)
+HOSTPYTHON= ./$(BUILDPYTHON)
# The task to run while instrument when building the profile-opt target
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
@@ -205,6 +206,7 @@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
+HOSTPGEN= $(PGEN)
POBJS= \
Parser/acceler.o \
@@ -394,8 +396,8 @@
# Build the shared modules
sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \
- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
esac
# Build static library
@@ -517,7 +519,7 @@
$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-@$(INSTALL) -d Include
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
$(PGEN): $(PGENOBJS)
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
@@ -886,24 +888,24 @@
done; \
done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
# Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR):
@@ -1001,7 +1003,8 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall:
- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
+ CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILE='$(CROSS_COMPILE)' \
+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
diff -u Python-2.6.6_orig/setup.py Python-2.6.6/setup.py
--- Python-2.6.6_orig/setup.py 2010-07-17 08:31:09.000000000 -0400
+++ Python-2.6.6/setup.py 2010-09-18 11:27:51.803983388 -0400
@@ -313,33 +313,39 @@
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
% ext.name)
return
+ if os.environ.get('CROSS_COMPILE_TARGET') == 'yes':
+ return
ext_filename = os.path.join(
self.build_lib,
self.get_ext_filename(self.get_ext_fullname(ext.name)))
try:
imp.load_dynamic(ext.name, ext_filename)
except ImportError, why:
- self.failed.append(ext.name)
- self.announce('*** WARNING: renaming "%s" since importing it'
- ' failed: %s' % (ext.name, why), level=3)
- assert not self.inplace
- basename, tail = os.path.splitext(ext_filename)
- newname = basename + "_failed" + tail
- if os.path.exists(newname):
- os.remove(newname)
- os.rename(ext_filename, newname)
-
- # XXX -- This relies on a Vile HACK in
- # distutils.command.build_ext.build_extension(). The
- # _built_objects attribute is stored there strictly for
- # use here.
- # If there is a failure, _built_objects may not be there,
- # so catch the AttributeError and move on.
- try:
- for filename in self._built_objects:
- os.remove(filename)
- except AttributeError:
- self.announce('unable to remove files (ignored)')
+ if os.environ.get('CROSS_COMPILE_TARGET') != "yes":
+ self.announce('*** WARNING: renaming "%s" since importing it'
+ ' failed: %s' % (ext.name, why), level=3)
+ assert not self.inplace
+ basename, tail = os.path.splitext(ext_filename)
+ newname = basename + "_failed" + tail
+ if os.path.exists(newname):
+ os.remove(newname)
+ os.rename(ext_filename, newname)
+
+ # XXX -- This relies on a Vile HACK in
+ # distutils.command.build_ext.build_extension(). The
+ # _built_objects attribute is stored there strictly for
+ # use here.
+ # If there is a failure, _built_objects may not be there,
+ # so catch the AttributeError and move on.
+ try:
+ for filename in self._built_objects:
+ os.remove(filename)
+ except AttributeError:
+ self.announce('unable to remove files (ignored)')
+ else:
+ self.announce('WARNING: "%s" failed importing, but we leave it '
+ 'because we are cross-compiling' %
+ ext.name)
except:
exc_type, why, tb = sys.exc_info()
self.announce('*** WARNING: importing extension "%s" '
@@ -742,7 +748,7 @@
if (ssl_incs is not None and
ssl_libs is not None and
- openssl_ver >= 0x00907000):
+ openssl_ver >= 0x00907000 and False):
# The _hashlib module wraps optimized implementations
# of hash functions from the OpenSSL library.
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
@@ -762,7 +768,7 @@
depends = ['md5.h']) )
missing.append('_hashlib')
- if (openssl_ver < 0x00908000):
+ if (True or openssl_ver < 0x00908000):
# OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
exts.append( Extension('_sha256', ['sha256module.c']) )
exts.append( Extension('_sha512', ['sha512module.c']) )
@@ -1823,7 +1829,7 @@
ffi_configfile):
from distutils.dir_util import mkpath
mkpath(ffi_builddir)
- config_args = []
+ config_args = sysconfig.get_config_var("CONFIG_ARGS").split(" ")
# Pass empty CFLAGS because we'll just append the resulting
# CFLAGS to Python's; -g or -O2 is to be avoided.

12
packages/lang/Python/scripts/python-config Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
case $1 in
--prefix) echo "/usr" ;;
--exec-prefix) echo "/usr" ;;
--includes) echo "-I%PREFIX%/include/python2.6" ;;
--libs) echo "-lpthread -ldl -lutil -lm -lpython2.6" ;;
--cflags) echo "-I%PREFIX%/include/python2.6 -DNDEBUG %CFLAGS%" ;;
--ldflags) echo "-L%PREFIX%/lib -lpthread -ldl -lutil -lm -lpython2.6" ;;
esac
exit 0

2
packages/lang/Python/url
View File

@ -1 +1 @@
http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2 http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tar.bz2