CVS commit: pkgsrc/lang

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Apr  3 13:17:28 UTC 2019

Modified Files:
        pkgsrc/lang/python27: Makefile
        pkgsrc/lang/python34: Makefile
        pkgsrc/lang/python35: Makefile
        pkgsrc/lang/python36: Makefile
        pkgsrc/lang/python37: Makefile

Log Message:
python*: rework logic used to determine if PLIST.nis is used.

Match the logic used by setup.py: it looks for two headers in the default
include path. This helps newer glibc linux.

Omit PLIST.dll on python3* because it doesn't appear in the PLIST.
Make PLIST.dll true on all non-IRIX.

tested: NetBSD-current, FreeBSD 11.2, Ubuntu 18.10, CentOS 6.9, Source Mage

>From Dr. Thomas Orgis, myself, and with pointers to a change from leot.

PR pkg/53673


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/python34/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/python35/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/python36/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python37/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python27/Makefile
diff -u pkgsrc/lang/python27/Makefile:1.78 pkgsrc/lang/python27/Makefile:1.79
--- pkgsrc/lang/python27/Makefile:1.78  Tue Mar 26 16:12:28 2019
+++ pkgsrc/lang/python27/Makefile       Wed Apr  3 13:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2019/03/26 16:12:28 gdt Exp $
+# $NetBSD: Makefile,v 1.79 2019/04/03 13:17:27 maya Exp $
 
 .include "dist.mk"
 
@@ -103,28 +103,22 @@ PLIST.qt= yes
 .  endif
 .endif
 
-.if ${OPSYS} == "IRIX"
-# Assume that IRIX (and IRIX alone) does not support a libpython.so.
-# Assume that 32-bit IRIX has NIS and 64-bit IRIX does not.
-.  if ${ABI} == "64"
-PLIST.no-nis=  yes
-.  else
-PLIST.nis=     yes
-.  endif
-.else
+.if ${OPSYS} != "IRIX"
 PLIST.dll=     yes
-# Determine if lib-dynload/nis.so (PLIST.nis) or
-# lib-dynload/nis-failed.so (PLIST.no-nis) will be built.
-.  if ${OPSYS} == "MirBSD" || "${OS_VARIANT}" == "chromeos"
-# neither nis nor no-nis
-.  elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-# \todo Explain the "!= NetBSD"; that seems to declare that any
-# remaining system other than NetBSD will have NIS, even if ypcat is
-# missing.
+.endif
+
+.for incdir in ${_OPSYS_INCLUDE_DIRS}
+.  if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
+HAVE_RPC_H=    yes
+.  endif
+.  if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
+HAVE_YP_PROT_H=        yes
+.  endif
+.endfor
+.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
 PLIST.nis=     yes
-.  else
+.else
 PLIST.no-nis=  yes
-.  endif
 .endif
 
 # configure complains about buggy getaddrinfo()

Index: pkgsrc/lang/python34/Makefile
diff -u pkgsrc/lang/python34/Makefile:1.30 pkgsrc/lang/python34/Makefile:1.31
--- pkgsrc/lang/python34/Makefile:1.30  Wed Mar 20 19:29:11 2019
+++ pkgsrc/lang/python34/Makefile       Wed Apr  3 13:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/03/20 19:29:11 adam Exp $
+# $NetBSD: Makefile,v 1.31 2019/04/03 13:17:27 maya Exp $
 
 .include "dist.mk"
 
@@ -75,22 +75,19 @@ PLIST.oss=  yes
 CFLAGS+=               -I${OSX_SDK_PATH:Q}/usr/include
 .endif
 
-PLIST_VARS+=   dll nis no-nis
-.if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST.no-nis=  yes
-.  else
-PLIST.nis=     yes
+PLIST_VARS+=   nis no-nis
+.for incdir in ${_OPSYS_INCLUDE_DIRS}
+.  if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
+HAVE_RPC_H=    yes
 .  endif
-.else
-PLIST.dll=     yes
-.  if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-.    if "${OS_VARIANT}" != "chromeos"
+.  if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
+HAVE_YP_PROT_H=        yes
+.  endif
+.endfor
+.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
 PLIST.nis=     yes
-.    endif
-.  else
+.else
 PLIST.no-nis=  yes
-.  endif
 .endif
 
 PLIST_SUBST+=  PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}

Index: pkgsrc/lang/python35/Makefile
diff -u pkgsrc/lang/python35/Makefile:1.17 pkgsrc/lang/python35/Makefile:1.18
--- pkgsrc/lang/python35/Makefile:1.17  Wed Mar 20 19:27:47 2019
+++ pkgsrc/lang/python35/Makefile       Wed Apr  3 13:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/03/20 19:27:47 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/04/03 13:17:27 maya Exp $
 
 .include "dist.mk"
 
@@ -77,22 +77,19 @@ PLIST.oss=  yes
 CFLAGS+=               -I${OSX_SDK_PATH:Q}/usr/include
 .endif
 
-PLIST_VARS+=   dll nis no-nis
-.if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST.no-nis=  yes
-.  else
-PLIST.nis=     yes
+PLIST_VARS+=   nis no-nis
+.for incdir in ${_OPSYS_INCLUDE_DIRS}
+.  if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
+HAVE_RPC_H=    yes
 .  endif
-.else
-PLIST.dll=     yes
-.  if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-.    if "${OS_VARIANT}" != "chromeos"
+.  if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
+HAVE_YP_PROT_H=        yes
+.  endif
+.endfor
+.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
 PLIST.nis=     yes
-.    endif
-.  else
+.else
 PLIST.no-nis=  yes
-.  endif
 .endif
 
 PLIST_SUBST+=  PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}

Index: pkgsrc/lang/python36/Makefile
diff -u pkgsrc/lang/python36/Makefile:1.16 pkgsrc/lang/python36/Makefile:1.17
--- pkgsrc/lang/python36/Makefile:1.16  Sat Mar  2 13:23:36 2019
+++ pkgsrc/lang/python36/Makefile       Wed Apr  3 13:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/03/02 13:23:36 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/04/03 13:17:27 maya Exp $
 
 .include "dist.mk"
 
@@ -78,22 +78,19 @@ PLIST.oss=  yes
 CFLAGS+=               -I${OSX_SDK_PATH:Q}/usr/include
 .endif
 
-PLIST_VARS+=   dll nis no-nis
-.if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST.no-nis=  yes
-.  else
-PLIST.nis=     yes
+PLIST_VARS+=   nis no-nis
+.for incdir in ${_OPSYS_INCLUDE_DIRS}
+.  if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
+HAVE_RPC_H=    yes
 .  endif
-.else
-PLIST.dll=     yes
-.  if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-.    if "${OS_VARIANT}" != "chromeos"
+.  if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
+HAVE_YP_PROT_H=        yes
+.  endif
+.endfor
+.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
 PLIST.nis=     yes
-.    endif
-.  else
+.else
 PLIST.no-nis=  yes
-.  endif
 .endif
 
 PLIST_SUBST+=  PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}

Index: pkgsrc/lang/python37/Makefile
diff -u pkgsrc/lang/python37/Makefile:1.5 pkgsrc/lang/python37/Makefile:1.6
--- pkgsrc/lang/python37/Makefile:1.5   Tue Mar 26 20:54:55 2019
+++ pkgsrc/lang/python37/Makefile       Wed Apr  3 13:17:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/03/26 20:54:55 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/03 13:17:28 maya Exp $
 
 .include "dist.mk"
 
@@ -77,22 +77,19 @@ PLIST.oss=  yes
 CFLAGS+=               -I${OSX_SDK_PATH:Q}/usr/include
 .endif
 
-PLIST_VARS+=   dll nis no-nis
-.if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST.no-nis=  yes
-.  else
-PLIST.nis=     yes
+PLIST_VARS+=   nis no-nis
+.for incdir in ${_OPSYS_INCLUDE_DIRS}
+.  if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
+HAVE_RPC_H=    yes
 .  endif
-.else
-PLIST.dll=     yes
-.  if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-.    if "${OS_VARIANT}" != "chromeos"
+.  if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
+HAVE_YP_PROT_H=        yes
+.  endif
+.endfor
+.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
 PLIST.nis=     yes
-.    endif
-.  else
+.else
 PLIST.no-nis=  yes
-.  endif
 .endif
 
 PLIST_SUBST+=  PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}