mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-02-16 05:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

main/python: fix posix_close name clash (against latest musl)

Browse Source
This commit is contained in:
Timo Teräs 2013-12-16 11:59:43 +00:00
parent 9f9341b2d1
commit ca8bb5854f
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/python/APKBUILD
View File

@ -2,7 +2,7 @@
pkgname=python
pkgver=2.7.6
_verbase=${pkgver%.*}
pkgrel=0
pkgrel=1
pkgdesc="A high-level scripting language"
url="http://www.python.org"
arch="all"
@ -15,6 +15,7 @@ depends=""
makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev
gdbm-dev sqlite-dev libffi-dev readline-dev paxctl"
source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.xz
fix-posix-close-clash.patch
find_library.patch
"
@ -88,8 +89,11 @@ gdbm() {
}
md5sums="bcf93efa8eaf383c98ed3ce40b763497 Python-2.7.6.tar.xz
10103fd4c0f5476aac7330c09e31b32e fix-posix-close-clash.patch
22e32fddd3a973172f2fd570f8c5c416 find_library.patch"
sha256sums="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 Python-2.7.6.tar.xz
08daec45cdd42d5bef137de5e569661ec0375ace1d0429fddd7a97d4d746aed2 fix-posix-close-clash.patch
452f9dc842316bcacfd7d6547ac5c1faaa286568cc782db1c0099464bc913946 find_library.patch"
sha512sums="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 Python-2.7.6.tar.xz
95cff3d1e9f6e7f7d766f4e87cd199cae4f983f7274285dffa59a72bd684601d03da942f0c2f9b18e6f1955e2a975b75cb6950cbe7f4eda6e7b7d8c55efcc05e fix-posix-close-clash.patch
a1ea61266bb56358158de4036f5be0ad579b44ae616fe0f8d5cef59610886daed73979308c26e56f944435167a6bb8cc6278e6f97f9a72b5f5786d3c31668fc2 find_library.patch"

20
main/python/fix-posix-close-clash.patch Normal file
View File

@ -0,0 +1,20 @@
--- Python-2.7.6/Modules/posixmodule.c.orig
+++ Python-2.7.6/Modules/posixmodule.c
@@ -6582,7 +6582,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -8960,7 +8960,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},