diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-16 07:21:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-16 07:21:30 +0000 |
| commit | c0ac128766d4f41b4d6f02bd7f034bf327e66b64 (patch) | |
| tree | af53c970cf6d6c68b8981f9c8da7163c0b49178d | |
| parent | e73a9710303903229f6bc99c9a54a0960796d91d (diff) | |
| download | aports-c0ac128766d4f41b4d6f02bd7f034bf327e66b64.tar.bz2 aports-c0ac128766d4f41b4d6f02bd7f034bf327e66b64.tar.xz | |
main/python3: upgrade to 3.5.0
| -rw-r--r-- | main/python3/APKBUILD | 40 | ||||
| -rw-r--r-- | main/python3/posix_close.patch | 20 |
2 files changed, 24 insertions, 36 deletions
diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD index e545176d99..09e8503380 100644 --- a/main/python3/APKBUILD +++ b/main/python3/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> pkgname=python3 -pkgver=3.4.3 -pkgrel=2 +pkgver=3.5.0 +pkgrel=0 pkgdesc="A high-level scripting language" url="http://www.python.org" arch="all" @@ -12,9 +12,8 @@ license="custom" subpackages="$pkgname-dev $pkgname-doc $pkgname-tests" depends="" makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev - sqlite-dev libffi-dev tcl-dev linux-headers" -source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz - posix_close.patch" + sqlite-dev libffi-dev tcl-dev linux-headers gdbm-dev libedit-dev" +source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz" _builddir="$srcdir"/Python-$pkgver prepare() { @@ -24,6 +23,13 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + + # force system libs + rm -r Modules/expat \ + Modules/zlib \ + Modules/_ctypes/darwin* \ + Modules/_ctypes/libffi* \ + || return 1 } build() { @@ -31,18 +37,23 @@ build() { ./configure \ --prefix=/usr \ --enable-shared \ + --enable-ipv6 \ + --with-computed-gotos \ --with-threads \ --with-system-ffi \ - --enable-unicode=ucs4 \ - --with-dbmliborder=ndbm \ - --disable-rpath \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --enable-loadable-sqlite-extensions \ + --disable-rpath \ + --without-ensurepip \ || return 1 - make || return 1 + make EXTRA_CFLAGS="$CFLAGS" || return 1 } package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" EXTRA_CFLAGS="$CFLAGS" install maninstall \ + || return 1 mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.3 install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } @@ -73,9 +84,6 @@ tests() { _mv_files } -md5sums="7d092d1bba6e17f0d9bd21b49e441dd5 Python-3.4.3.tar.xz -47be456068550c4239efbfa8866b5d6a posix_close.patch" -sha256sums="b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 Python-3.4.3.tar.xz -c34c2959e06e71d61116595d337dfa7f3c468ea775004a4fc53acc400972afe5 posix_close.patch" -sha512sums="55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 Python-3.4.3.tar.xz -a7f73fe2f114727999849cb8cecfd822025a129e57ae14ec0c1adc0ce6204c556467ea2d1008ce55745e692d2224f23774e1775316e3fdae812ac6c85e6780a2 posix_close.patch" +md5sums="d149d2812f10cbe04c042232e7964171 Python-3.5.0.tar.xz" +sha256sums="d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91 Python-3.5.0.tar.xz" +sha512sums="f06bd652484aa89371021d0f9fcb08e6e905e90b39ae065d7df75b367e66b7ea43a818ca33ce04aa3d6746b5e8b1b83e90b709ac2203324fb7a595c1017be149 Python-3.5.0.tar.xz" diff --git a/main/python3/posix_close.patch b/main/python3/posix_close.patch deleted file mode 100644 index e15433cfe5..0000000000 --- a/main/python3/posix_close.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./Modules/posixmodule.c.orig -+++ ./Modules/posixmodule.c -@@ -7768,7 +7768,7 @@ - function posix_close. - */ - static PyObject * --posix_close_(PyObject *self, PyObject *args) -+_posix_close_(PyObject *self, PyObject *args) - { - int fd, res; - if (!PyArg_ParseTuple(args, "i:close", &fd)) -@@ -11426,7 +11426,7 @@ - {"open", (PyCFunction)posix_open,\ - METH_VARARGS | METH_KEYWORDS, - posix_open__doc__}, -- {"close", posix_close_, METH_VARARGS, posix_close__doc__}, -+ {"close", _posix_close_, METH_VARARGS, posix_close__doc__}, - {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__}, - {"device_encoding", device_encoding, METH_VARARGS, device_encoding__doc__}, - {"dup", posix_dup, METH_VARARGS, posix_dup__doc__}, |