summaryrefslogtreecommitdiff
path: root/lang/python36
diff options
context:
space:
mode:
authorroy <roy@pkgsrc.org>2019-04-25 15:59:54 +0000
committerroy <roy@pkgsrc.org>2019-04-25 15:59:54 +0000
commitceb103f92e71d76e9c75754fed78bc37d09ab9a2 (patch)
tree9846f91af9c88d1ac690f44c96d1c8cd83057787 /lang/python36
parent1ffb34718f5eb838ca1a9aa0a549a3488210996b (diff)
downloadpkgsrc-ceb103f92e71d76e9c75754fed78bc37d09ab9a2.tar.gz
python: Don't install nis_failed.so if no yp headers
Because python won't even try to build it. You only see nis_failed.so if there is an error building it, when it wanted to build it, and that should be fixed accordingly. In a nutshell, if the yp headers are installed, python will build the nis module, otherwise it won't. On netbsd systems at least, if you have the yp headers installed and subsequently re-install over the top with MKYP=no you get into the state where the headers are installed, but the functions are no longer in libc. This is an error with *your* system - either rebuild with MKYP=yes OR remove the yp headers from include/rpc and include/rpcsvc. Follow on fix for PR pkg/53673.
Diffstat (limited to 'lang/python36')
-rw-r--r--lang/python36/Makefile6
-rw-r--r--lang/python36/PLIST3
2 files changed, 3 insertions, 6 deletions
diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index f2830559c76..99fa4d6451c 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/04/03 13:17:27 maya Exp $
+# $NetBSD: Makefile,v 1.18 2019/04/25 15:59:54 roy Exp $
.include "dist.mk"
@@ -78,7 +78,7 @@ PLIST.oss= yes
CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
.endif
-PLIST_VARS+= nis no-nis
+PLIST_VARS+= nis
.for incdir in ${_OPSYS_INCLUDE_DIRS}
. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
HAVE_RPC_H= yes
@@ -89,8 +89,6 @@ HAVE_YP_PROT_H= yes
.endfor
.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
PLIST.nis= yes
-.else
-PLIST.no-nis= yes
.endif
PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
diff --git a/lang/python36/PLIST b/lang/python36/PLIST
index 35f32a90ea9..1cf5880b158 100644
--- a/lang/python36/PLIST
+++ b/lang/python36/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2018/12/31 10:06:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/04/25 15:59:54 roy Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1930,7 +1930,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
-${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so