[pkgsrc/trunk]: pkgsrc/lang python: Don't install nis_failed.so if no yp headers

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1476bac2525c
branches:  trunk
changeset: 394826:1476bac2525c
user:      roy <roy%pkgsrc.org@localhost>
date:      Thu Apr 25 15:59:54 2019 +0000

description:
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:

 lang/python27/Makefile |  6 ++----
 lang/python27/PLIST    |  3 +--
 lang/python34/Makefile |  6 ++----
 lang/python34/PLIST    |  3 +--
 lang/python35/Makefile |  6 ++----
 lang/python35/PLIST    |  3 +--
 lang/python36/Makefile |  6 ++----
 lang/python36/PLIST    |  3 +--
 lang/python37/Makefile |  6 ++----
 lang/python37/PLIST    |  3 +--
 10 files changed, 15 insertions(+), 30 deletions(-)

diffs (220 lines):

diff -r 8e0f57005965 -r 1476bac2525c lang/python27/Makefile
--- a/lang/python27/Makefile    Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python27/Makefile    Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2019/04/03 13:17:27 maya Exp $
+# $NetBSD: Makefile,v 1.80 2019/04/25 15:59:54 roy Exp $
 
 .include "dist.mk"
 
@@ -80,7 +80,7 @@
 IS_64BIT_PLATFORM?=    no
 .endif
 
-PLIST_VARS+=   dl dll extra-so nis no-nis qt
+PLIST_VARS+=   dl dll extra-so nis qt
 
 # the dl module isn't built for 64 bit archs
 .if empty(IS_64BIT_PLATFORM:M[yY][eE][sS])
@@ -117,8 +117,6 @@
 .endfor
 .if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
 PLIST.nis=     yes
-.else
-PLIST.no-nis=  yes
 .endif
 
 # configure complains about buggy getaddrinfo()
diff -r 8e0f57005965 -r 1476bac2525c lang/python27/PLIST
--- a/lang/python27/PLIST       Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python27/PLIST       Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/03/05 12:43:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/04/25 15:59:54 roy Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1938,7 +1938,6 @@
 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/operator.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
diff -r 8e0f57005965 -r 1476bac2525c lang/python34/Makefile
--- a/lang/python34/Makefile    Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python34/Makefile    Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/04/03 13:17:27 maya Exp $
+# $NetBSD: Makefile,v 1.32 2019/04/25 15:59:54 roy Exp $
 
 .include "dist.mk"
 
@@ -75,7 +75,7 @@
 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
@@ -86,8 +86,6 @@
 .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 -r 8e0f57005965 -r 1476bac2525c lang/python34/PLIST
--- a/lang/python34/PLIST       Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python34/PLIST       Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2019/03/20 19:29:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/04/25 15:59:54 roy Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1780,7 +1780,6 @@
 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
diff -r 8e0f57005965 -r 1476bac2525c lang/python35/Makefile
--- a/lang/python35/Makefile    Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python35/Makefile    Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/04/03 13:17:27 maya Exp $
+# $NetBSD: Makefile,v 1.19 2019/04/25 15:59:54 roy Exp $
 
 .include "dist.mk"
 
@@ -77,7 +77,7 @@
 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
@@ -88,8 +88,6 @@
 .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 -r 8e0f57005965 -r 1476bac2525c lang/python35/PLIST
--- a/lang/python35/PLIST       Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python35/PLIST       Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/03/20 19:27:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/04/25 15:59:54 roy Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1831,7 +1831,6 @@
 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
diff -r 8e0f57005965 -r 1476bac2525c lang/python36/Makefile
--- a/lang/python36/Makefile    Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python36/Makefile    Thu Apr 25 15:59:54 2019 +0000
@@ -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 @@
 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 @@
 .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 -r 8e0f57005965 -r 1476bac2525c lang/python36/PLIST
--- a/lang/python36/PLIST       Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python36/PLIST       Thu Apr 25 15:59:54 2019 +0000
@@ -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/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
diff -r 8e0f57005965 -r 1476bac2525c lang/python37/Makefile
--- a/lang/python37/Makefile    Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python37/Makefile    Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/04/03 13:17:28 maya Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/25 15:59:54 roy Exp $
 
 .include "dist.mk"
 
@@ -77,7 +77,7 @@
 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
@@ -88,8 +88,6 @@
 .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 -r 8e0f57005965 -r 1476bac2525c lang/python37/PLIST
--- a/lang/python37/PLIST       Thu Apr 25 15:56:48 2019 +0000
+++ b/lang/python37/PLIST       Thu Apr 25 15:59:54 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/03/26 20:54:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/04/25 15:59:54 roy Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 ${PLIST.pymalloc}bin/python${PY_VER_SUFFIX}
@@ -1957,7 +1957,6 @@
 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