[patch] patch, use "git am" to apply, fixes python:3.6 only

0001-dev-lang-python-Hackfix-the-build-with-glibc-2.26.-O.patch (text/plain), 3.01 KB, created by Andreas K. Hüttel on 2017-10-28 19:32:05 UTC

From 011b8d0e2d737623bb98b0fcf3689681a9b08101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[e-mail]>
Date: Sat, 28 Oct 2017 21:27:36 +0200
Subject: [PATCH] dev-lang/python: Hackfix the build with glibc-2.26. Only 3.6
 so far.

Bug: https://bugs.gentoo.org/628768
---
 dev-lang/python/files/3.6-nis.patch | 23 +++++++++++++++++++++++
 dev-lang/python/python-3.6.3.ebuild | 12 +++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 dev-lang/python/files/3.6-nis.patch

diff --git a/dev-lang/python/files/3.6-nis.patch b/dev-lang/python/files/3.6-nis.patch
new file mode 100644
index 000000000000..590838deceae
--- /dev/null
+++ b/dev-lang/python/files/3.6-nis.patch
@@ -0,0 +1,23 @@
+diff --git a/setup.py b/setup.py
+index 51e5d7eff7..4ea1008d5c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1350,12 +1350,17 @@ class PyBuildExt(build_ext):
+             exts.append( Extension('resource', ['resource.c']) )
+ 
+             # Sun yellow pages. Some systems have the functions in libc.
++            # We add the include dir of libtirpc in case we need it.
++            inc_dirs.append('/usr/include/tirpc')
+             if (host_platform not in ['cygwin', 'qnx6'] and
+-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
++                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None and
++                find_file('rpc/rpc.h', inc_dirs, []) is not None):
+                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
+                     libs = ['nsl']
+                 else:
+                     libs = []
++                if (self.compiler.find_library_file(lib_dirs, 'tirpc')):
++                    libs.append('tirpc')
+                 exts.append( Extension('nis', ['nismodule.c'],
+                                        libraries = libs) )
+             else:
diff --git a/dev-lang/python/python-3.6.3.ebuild b/dev-lang/python/python-3.6.3.ebuild
index fa67a439bfa2..1b48b368fa3c 100644
--- a/dev-lang/python/python-3.6.3.ebuild
+++ b/dev-lang/python/python-3.6.3.ebuild
@@ -46,7 +46,12 @@ RDEPEND="app-arch/bzip2:0=
 		dev-tcltk/tix
 	)
 	xml? ( >=dev-libs/expat-2.1:0= )
-	!!<sys-apps/sandbox-2.6-r1"
+	!!<sys-apps/sandbox-2.6-r1
+	elibc_glibc? (
+		|| ( <sys-libs/glibc-2.26[rpc]
+		     ( net-libs/libtirpc net-libs/libnsl ) )
+	)
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
@@ -66,6 +71,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch"
 	epatch "${FILESDIR}/3.6-blake2.patch"
 
+	has_version '<sys-libs/glibc-2.26[rpc]' || epatch "${FILESDIR}/3.6-nis.patch"
+
 	epatch_user
 
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
@@ -124,6 +131,9 @@ src_configure() {
 	# Please query BSD team before removing this!
 	append-ldflags "-L."
 
+	# We need this in case we are using glibc-2.26 and libtirpc
+	has_version '<sys-libs/glibc-2.26[rpc]' || append-cflags "-I${EPREFIX}/usr/include/tirpc"
+
 	local dbmliborder
 	if use gdbm; then
 		dbmliborder+="${dbmliborder:+:}gdbm"
-- 
2.14.3