diff options
| author | piernov <piernov@piernov.org> | 2011-07-15 23:39:22 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2011-07-15 23:39:22 +0200 |
| commit | 2dd2274205134b05b45e5bfc3d000d74aa413732 (patch) | |
| tree | e53fbc39043c68203ee533b3445f6ffb09328a5c | |
| parent | 47ed8b4a8e5608234f38877ae4711ec0fcad1ef1 (diff) | |
| download | nutyx-extra-2dd2274205134b05b45e5bfc3d000d74aa413732.tar.gz nutyx-extra-2dd2274205134b05b45e5bfc3d000d74aa413732.tar.bz2 nutyx-extra-2dd2274205134b05b45e5bfc3d000d74aa413732.tar.xz nutyx-extra-2dd2274205134b05b45e5bfc3d000d74aa413732.zip | |
python 3.2-2 inclusion module expat
| -rw-r--r-- | base/python/.footprint.i686 | 3 | ||||
| -rw-r--r-- | base/python/.footprint.x86_64 | 3 | ||||
| -rwxr-xr-x | base/python/Pkgfile | 7 | ||||
| -rw-r--r-- | base/python/python-internal-expat.patch | 33 |
4 files changed, 9 insertions, 37 deletions
diff --git a/base/python/.footprint.i686 b/base/python/.footprint.i686 index e13ea89c0..2af4f15cb 100644 --- a/base/python/.footprint.i686 +++ b/base/python/.footprint.i686 @@ -115,6 +115,8 @@ lrwxrwxrwx root/root usr/lib/libpython3.2mu.so -> libpython3.2mu.so.1.0 -r-xr-xr-x root/root usr/lib/libpython3.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/python-3.2.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/python-3.2mu.pc -> python-3.2.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/python3.pc -> python-3.2.pc drwxr-xr-x root/root usr/lib/python3.2/ -rw-r--r-- root/root usr/lib/python3.2/LICENSE.txt -rw-r--r-- root/root usr/lib/python3.2/__future__.py @@ -1977,6 +1979,7 @@ drwxr-xr-x root/root usr/lib/python3.2/lib-dynload/ -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/nis.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/ossaudiodev.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/parser.cpython-32mu.so +-rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/pyexpat.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/readline.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/resource.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/select.cpython-32mu.so diff --git a/base/python/.footprint.x86_64 b/base/python/.footprint.x86_64 index e13ea89c0..2af4f15cb 100644 --- a/base/python/.footprint.x86_64 +++ b/base/python/.footprint.x86_64 @@ -115,6 +115,8 @@ lrwxrwxrwx root/root usr/lib/libpython3.2mu.so -> libpython3.2mu.so.1.0 -r-xr-xr-x root/root usr/lib/libpython3.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/python-3.2.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/python-3.2mu.pc -> python-3.2.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/python3.pc -> python-3.2.pc drwxr-xr-x root/root usr/lib/python3.2/ -rw-r--r-- root/root usr/lib/python3.2/LICENSE.txt -rw-r--r-- root/root usr/lib/python3.2/__future__.py @@ -1977,6 +1979,7 @@ drwxr-xr-x root/root usr/lib/python3.2/lib-dynload/ -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/nis.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/ossaudiodev.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/parser.cpython-32mu.so +-rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/pyexpat.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/readline.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/resource.cpython-32mu.so -rwxr-xr-x root/root usr/lib/python3.2/lib-dynload/select.cpython-32mu.so diff --git a/base/python/Pkgfile b/base/python/Pkgfile index 7d58b3f65..ece86814f 100755 --- a/base/python/Pkgfile +++ b/base/python/Pkgfile @@ -2,17 +2,16 @@ # URL: http://www.python.org # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: -# Run on: +# Depends on: expat +# Run on: expat name=python version=3.2 -release=1 +release=2 source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2) build() { cd Python-$version - rm -r Modules/expat rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* diff --git a/base/python/python-internal-expat.patch b/base/python/python-internal-expat.patch deleted file mode 100644 index b1b17f01d..000000000 --- a/base/python/python-internal-expat.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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: |