From b70981b68efcce5256eb11c6cd26ae123b10b6ea Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 24 Jul 2009 08:01:31 +0000 Subject: moved extra/* to main/ and fixed misc build issues --- main/python/APKBUILD | 33 +++++++++++++++++++++++++++++ main/python/python-2.6-internal-expat.patch | 33 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 main/python/APKBUILD create mode 100644 main/python/python-2.6-internal-expat.patch (limited to 'main/python') diff --git a/main/python/APKBUILD b/main/python/APKBUILD new file mode 100644 index 0000000000..d5d38b99ca --- /dev/null +++ b/main/python/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Natanael Copa +pkgname=python +pkgver=2.6.2 +pkgrel=1 +pkgdesc="A high-level scripting language" +url="http://www.python.org" +license="custom" +subpackages="$pkgname-dev $pkgname-doc" +depends="db expat openssl zlib ncurses uclibc" +makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext" +source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2 + $pkgname-2.6-internal-expat.patch + " + +build() { + cd "$srcdir/Python-$pkgver" + for i in ../*.patch; do + msg "Apply $i" + patch -p1 < $i || return 1 + done + + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --enable-unicode \ + --disable-gdbm + + make || return 1 + make DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} +md5sums="245db9f1e0f09ab7e0faaa0cf7301011 Python-2.6.2.tar.bz2 +9d64df5e0a6aed149a792c7bff16e3d9 python-2.6-internal-expat.patch" diff --git a/main/python/python-2.6-internal-expat.patch b/main/python/python-2.6-internal-expat.patch new file mode 100644 index 0000000000..f345db8c8e --- /dev/null +++ b/main/python/python-2.6-internal-expat.patch @@ -0,0 +1,33 @@ +--- a/setup.py 2008-04-22 12:12:24.613554757 +0300 ++++ b/setup.py 2008-04-22 12:13:09.276544063 +0300 +@@ -1035,18 +1035,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', + ], + )) + +@@ -1058,6 +1055,7 @@ + exts.append(Extension('_elementtree', + define_macros = define_macros, + include_dirs = [expatinc], ++ libraries = ['expat'], + sources = ['_elementtree.c'], + )) + -- cgit v1.2.3