summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/python/.footprint2
-rw-r--r--extra/python/.md5sum1
-rwxr-xr-xextra/python/Pkgfile15
-rw-r--r--extra/python/python-internal-expat.patch33
4 files changed, 46 insertions, 5 deletions
diff --git a/extra/python/.footprint b/extra/python/.footprint
index babd1e0a2..758d87c71 100644
--- a/extra/python/.footprint
+++ b/extra/python/.footprint
@@ -1719,7 +1719,7 @@ drwxr-xr-x root/root usr/lib/python3.1/lib-dynload/
-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_ctypes_test.so
-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_curses.so
-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_curses_panel.so
--rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_dbm.so
+-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_dbm_failed.so
-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_elementtree.so
-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_gdbm.so
-rwxr-xr-x root/root usr/lib/python3.1/lib-dynload/_hashlib.so
diff --git a/extra/python/.md5sum b/extra/python/.md5sum
index e1762683b..fe2af6093 100644
--- a/extra/python/.md5sum
+++ b/extra/python/.md5sum
@@ -1 +1,2 @@
ad5e5f1c07e829321e0a015f8cafe245 Python-3.1.3.tar.bz2
+57fa26dd3353a697e8262d926aa035ad python-internal-expat.patch
diff --git a/extra/python/Pkgfile b/extra/python/Pkgfile
index 00a9b6927..99ac74e95 100755
--- a/extra/python/Pkgfile
+++ b/extra/python/Pkgfile
@@ -2,16 +2,23 @@
# URL: http://www.python.org
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: pth, sqlite3
+# Depends on: expat, bzip2, gdbm, openssl, libffi, zlib, tk, sqlite3
name=python
version=3.1.3
-release=3
-source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2)
+release=4
+source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2
+ python-internal-expat.patch)
build() {
cd Python-$version
- sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" setup.py
+
+ patch -Np0 -i ../python-internal-expat.patch
+ rm -r Modules/expat
+ rm -r Modules/zlib
+ rm -r Modules/_ctypes/{darwin,libffi}*
+
+# sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" setup.py
export OPT="${CFLAGS}"
export CPPFLAGS+="`pkg-config --cflags-only-I libffi`"
diff --git a/extra/python/python-internal-expat.patch b/extra/python/python-internal-expat.patch
new file mode 100644
index 000000000..b1b17f01d
--- /dev/null
+++ b/extra/python/python-internal-expat.patch
@@ -0,0 +1,33 @@
+--- setup.py 2010-11-26 06:56:26.000000000 -0500
++++ setup.py 2010-11-29 07:51:25.000000031 -0500
+@@ -1227,18 +1227,15 @@
+ #
+ # More information on Expat can be found at www.libexpat.org.
+ #
+- expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
+- define_macros = [
+- ('HAVE_EXPAT_CONFIG_H', '1'),
+- ]
++ # Use system expat
++ expatinc = '/usr/include'
++ define_macros = []
+
+ exts.append(Extension('pyexpat',
+ define_macros = define_macros,
+ include_dirs = [expatinc],
++ libraries = ['expat'],
+ sources = ['pyexpat.c',
+- 'expat/xmlparse.c',
+- 'expat/xmlrole.c',
+- 'expat/xmltok.c',
+ ],
+ ))
+
+@@ -1250,6 +1247,7 @@
+ exts.append(Extension('_elementtree',
+ define_macros = define_macros,
+ include_dirs = [expatinc],
++ libraries = ['expat'],
+ sources = ['_elementtree.c'],
+ ))
+ else: