Attachment #500566 for bug #631488

View | Details | Raw Unified | Return to bug 631488
Collapse All | Expand All




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:

Lines 46-52 RDEPEND="app-arch/bzip2:0= Link Here

(-)a/dev-lang/python/python-3.6.3.ebuild (-2 / +11 lines)
46	dev-tcltk/tix	46	dev-tcltk/tix
47	)	47	)
48	xml? ( >=dev-libs/expat-2.1:0= )	48	xml? ( >=dev-libs/expat-2.1:0= )
49	!!<sys-apps/sandbox-2.6-r1"	49	!!<sys-apps/sandbox-2.6-r1
		50	elibc_glibc? (
		51	\|\| ( <sys-libs/glibc-2.26[rpc]
		52	( net-libs/libtirpc net-libs/libnsl ) )
		53	)
		54	"
50	DEPEND="${RDEPEND}	55	DEPEND="${RDEPEND}
51	virtual/pkgconfig	56	virtual/pkgconfig
52	!sys-devel/gcc[libffi(-)]"	57	!sys-devel/gcc[libffi(-)]"
Lines 66-71 src_prepare() { Link Here
66	epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch"	71	epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch"
67	epatch "${FILESDIR}/3.6-blake2.patch"	72	epatch "${FILESDIR}/3.6-blake2.patch"
68		73
		74	has_version '<sys-libs/glibc-2.26[rpc]' \|\| epatch "${FILESDIR}/3.6-nis.patch"
		75
69	epatch_user	76	epatch_user
70		77
71	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \	78	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lines 124-129 src_configure() { Link Here
124	# Please query BSD team before removing this!	131	# Please query BSD team before removing this!
125	append-ldflags "-L."	132	append-ldflags "-L."
126		133
		134	# We need this in case we are using glibc-2.26 and libtirpc
		135	has_version '<sys-libs/glibc-2.26[rpc]' \|\| append-cflags "-I${EPREFIX}/usr/include/tirpc"
		136
127	local dbmliborder	137	local dbmliborder
128	if use gdbm; then	138	if use gdbm; then
129	dbmliborder+="${dbmliborder:+:}gdbm"	139	dbmliborder+="${dbmliborder:+:}gdbm"
130	-

Return to bug 631488

Line 0 Link Here

(-)a/dev-lang/python/files/3.6-nis.patch (+23 lines)
	1	diff --git a/setup.py b/setup.py
	2	index 51e5d7eff7..4ea1008d5c 100644
	3	--- a/setup.py
	4	+++ b/setup.py
	5	@@ -1350,12 +1350,17 @@ class PyBuildExt(build_ext):
	6	exts.append( Extension('resource', ['resource.c']) )
	7
	8	# Sun yellow pages. Some systems have the functions in libc.
	9	+ # We add the include dir of libtirpc in case we need it.
	10	+ inc_dirs.append('/usr/include/tirpc')
	11	if (host_platform not in ['cygwin', 'qnx6'] and
	12	- find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
	13	+ find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None and
	14	+ find_file('rpc/rpc.h', inc_dirs, []) is not None):
	15	if (self.compiler.find_library_file(lib_dirs, 'nsl')):
	16	libs = ['nsl']
	17	else:
	18	libs = []
	19	+ if (self.compiler.find_library_file(lib_dirs, 'tirpc')):
	20	+ libs.append('tirpc')
	21	exts.append( Extension('nis', ['nismodule.c'],
	22	libraries = libs) )
	23	else: