CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Roy Marples" <roy%netbsd.org@localhost>
Date: Thu, 25 Apr 2019 15:59:55 +0000

Module Name:    pkgsrc
Committed By:   roy
Date:           Thu Apr 25 15:59:54 UTC 2019

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python27/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/python34/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/python34/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python35/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/python35/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/python36/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/python36/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/python37/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python37/PLIST

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.79 pkgsrc/lang/python27/Makefile:1.80
--- pkgsrc/lang/python27/Makefile:1.79  Wed Apr  3 13:17:27 2019
+++ pkgsrc/lang/python27/Makefile       Thu Apr 25 15:59:54 2019
@@ -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?=   yes
 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 @@ 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
 
 # configure complains about buggy getaddrinfo()

Index: pkgsrc/lang/python27/PLIST
diff -u pkgsrc/lang/python27/PLIST:1.2 pkgsrc/lang/python27/PLIST:1.3
--- pkgsrc/lang/python27/PLIST:1.2      Tue Mar  5 12:43:40 2019
+++ pkgsrc/lang/python27/PLIST  Thu Apr 25 15:59:54 2019
@@ -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/i
 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

Index: pkgsrc/lang/python34/Makefile
diff -u pkgsrc/lang/python34/Makefile:1.31 pkgsrc/lang/python34/Makefile:1.32
--- pkgsrc/lang/python34/Makefile:1.31  Wed Apr  3 13:17:27 2019
+++ pkgsrc/lang/python34/Makefile       Thu Apr 25 15:59:54 2019
@@ -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 @@ 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
@@ -86,8 +86,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}

Index: pkgsrc/lang/python34/PLIST
diff -u pkgsrc/lang/python34/PLIST:1.11 pkgsrc/lang/python34/PLIST:1.12
--- pkgsrc/lang/python34/PLIST:1.11     Wed Mar 20 19:29:11 2019
+++ pkgsrc/lang/python34/PLIST  Thu Apr 25 15:59:54 2019
@@ -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/g
 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

Index: pkgsrc/lang/python35/Makefile
diff -u pkgsrc/lang/python35/Makefile:1.18 pkgsrc/lang/python35/Makefile:1.19
--- pkgsrc/lang/python35/Makefile:1.18  Wed Apr  3 13:17:27 2019
+++ pkgsrc/lang/python35/Makefile       Thu Apr 25 15:59:54 2019
@@ -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 @@ 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
@@ -88,8 +88,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}

Index: pkgsrc/lang/python35/PLIST
diff -u pkgsrc/lang/python35/PLIST:1.9 pkgsrc/lang/python35/PLIST:1.10
--- pkgsrc/lang/python35/PLIST:1.9      Wed Mar 20 19:27:47 2019
+++ pkgsrc/lang/python35/PLIST  Thu Apr 25 15:59:54 2019
@@ -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/g
 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

Index: pkgsrc/lang/python36/Makefile
diff -u pkgsrc/lang/python36/Makefile:1.17 pkgsrc/lang/python36/Makefile:1.18
--- pkgsrc/lang/python36/Makefile:1.17  Wed Apr  3 13:17:27 2019
+++ pkgsrc/lang/python36/Makefile       Thu Apr 25 15:59:54 2019
@@ -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}

Index: pkgsrc/lang/python36/PLIST
diff -u pkgsrc/lang/python36/PLIST:1.13 pkgsrc/lang/python36/PLIST:1.14
--- pkgsrc/lang/python36/PLIST:1.13     Mon Dec 31 10:06:45 2018
+++ pkgsrc/lang/python36/PLIST  Thu Apr 25 15:59:54 2019
@@ -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/g
 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

Index: pkgsrc/lang/python37/Makefile
diff -u pkgsrc/lang/python37/Makefile:1.6 pkgsrc/lang/python37/Makefile:1.7
--- pkgsrc/lang/python37/Makefile:1.6   Wed Apr  3 13:17:28 2019
+++ pkgsrc/lang/python37/Makefile       Thu Apr 25 15:59:54 2019
@@ -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 @@ 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
@@ -88,8 +88,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}

Index: pkgsrc/lang/python37/PLIST
diff -u pkgsrc/lang/python37/PLIST:1.5 pkgsrc/lang/python37/PLIST:1.6
--- pkgsrc/lang/python37/PLIST:1.5      Tue Mar 26 20:54:55 2019
+++ pkgsrc/lang/python37/PLIST  Thu Apr 25 15:59:54 2019
@@ -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/g
 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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/graphics/p5-Image-ExifTool
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/graphics/p5-Image-ExifTool
Indexes:

Home | Main Index | Thread Index | Old Index