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

["Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>]

.

Am 27. Dezember 2023 16:02:53 MEZ schrieb Greg Troxel <gdt%lexort.com@localhost>:
>This seems like a very big change this late in the freeze.
>
>Is it feasible to instead just enhance the conditional that decides if
>PLIST.nis should be yes, so that on Linux systems with the headers it
>matches what python's build does (and doesn't change processing on
>!Linux).  That sounds like less churn and safer.
>

This is what I posted earlier in this thread, probably also to be applied to python312. It does look for .pc files, as build does. Shall I apply that instead and we switch to py-nis with python313?

Index: MakefileRCS file: /cvsroot/pkgsrc/lang/python311/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	23 Nov 2023 12:43:35 -0000	1.21
+++ Makefile	7 Dec 2023 17:23:30 -0000
@@ -111,6 +111,17 @@
.if ${OPSYS} != "Linux"
PLIST.dbm=	yes
.endif
+
+# On glibc systems, those two libs must be locatable via pkg-config for
+# the python configure to utilize them to build the NIS module.
+BUILTIN_FIND_PKGCONFIG_FILES_VAR:=	TIRPC_PC NSL_PC
+BUILTIN_FIND_PKGCONFIG_FILES.TIRPC_PC:=	libtirpc.pc
+BUILTIN_FIND_PKGCONFIG_FILES.NSL_PC:=	libnsl.pc
+.include "../../mk/buildlink3/find-pkgconfig-files.mk"
+.if ${NSL_PC} != __nonexistent__ && ${TIRPC_PC} != __nonexistent__
+PLIST.nis=	yes
+.endif
+
.for incdir in ${_OPSYS_INCLUDE_DIRS}
. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
HAVE_RPC_H=	yes
@@ -206,6 +217,11 @@
CHECK_WRKREF_SKIP+=	lib/python${PY_VER_SUFFIX}/__pycache__/_sysconfigdata*
CHECK_WRKREF_SKIP+=	lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Makefile

+pre-configure:
+.if ${PLIST.nis:Uno} == yes
+	${LN} -sf ${TIRPC_PC:Q} ${NSL_PC:Q} ${BUILDLINK_DIR}/lib/pkgconfig
+.endif
+
# Avoid error: Cannot generate ./Include/opcode.h, python not found !
post-configure:
	touch ${WRKSRC}/Include/opcode.h

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