From ca8bb5854f0617841f701e9b1d5fa84be5adb790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 16 Dec 2013 11:59:43 +0000
Subject: main/python: fix posix_close name clash (against latest musl)

---
 main/python/APKBUILD                    |  6 +++++-
 main/python/fix-posix-close-clash.patch | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 main/python/fix-posix-close-clash.patch

(limited to 'main')

diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index 43d68e2f1..fad33f84e 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -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"
diff --git a/main/python/fix-posix-close-clash.patch b/main/python/fix-posix-close-clash.patch
new file mode 100644
index 000000000..6b77acacb
--- /dev/null
+++ b/main/python/fix-posix-close-clash.patch
@@ -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__},
-- 
cgit v1.2.3