tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Fixing lang/python311 by splitting off NIS module (Re: using pkg-config modules from host (Re: wip/py-numpy + blas))



Am Thu, 28 Dec 2023 13:00:54 +0100
schrieb Niclas Rosenvik <nros%netbsd.org@localhost>:

> Greg, Thomas and other would this be okay:
> 
> .if ${OPSYS} == "Linux"
> CONFIGURE_ARGS+= ac_cv_search_yp_match=no
> .else
> here the large configure parts that looks for nis header files and sets
> PLIST.nis .
> .endif
> 
h> So no PLIST churn on Linux.
> I have tested it on a GLIBC system with nis in GLIBC (Slackware 14) and
> on one with nsl as a separate package (Fedora).

Thanks for the input, and also testing on differing platforms (my
testing on CentOS 7 got stuck because of the lively discussions …)

I actually think that we got to a good resolution with

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python311/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	11 Dec 2023 10:23:42 -0000	1.22
+++ Makefile	27 Dec 2023 20:16:50 -0000
@@ -111,10 +111,16 @@
 PLIST.dbm=	yes
 .endif
 .for incdir in ${_OPSYS_INCLUDE_DIRS}
-.  if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
+.  if exists(${incdir}/rpc/rpc.h)
+HAVE_RPC_H=	yes
+.  elif exists(${incdir}/tirpc/rpc/rpc.h)
+CPPFLAGS+=	-I${incdir}/tirpc
 HAVE_RPC_H=	yes
 .  endif
-.  if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
+.  if exists(${incdir}/rpcsvc/yp_prot.h)
+HAVE_YP_PROT_H=	yes
+.  elif exists(${incdir}/nsl/rpcsvc/yp_prot.h)
+CPPFLAGS+=	-I${incdir}/nsl
 HAVE_YP_PROT_H=	yes
 .  endif
 .endfor


No patching of sources, no change in expected behaviour, the logic in
the Makefile more closely mimicking what the configure script does,
presupposing failure of the pkg-config libnsl check. And with
python313, all this goes away for the wip/py-nis and wip/libnsl
together with some builtin.mk (trivial for BSD systems with

I presume you missed that part since the thread got tangly.

I am about to commit the above that I tested on Ubuntu 22.04. It would
be cool if you could verify that it works on both glibc setups. 


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg


Home | Main Index | Thread Index | Old Index