On updating, I found that I had py-gobject3 built for 27, but with the
main PKGPATH. Not realizing it had been forked for 27/3, I did:
$ make PYTHON_VERSION_REQD=27 replace
make: "/home/n0/gdt/pkgsrc-current/pkgsrc/graphics/py-cairo/buildlink3.mk" line 12: Malformed conditional (${PYVERSSUFFIX} == "2.7")
make: Fatal errors encountered -- cannot continue
make: stopped in /home/n0/gdt/pkgsrc-current/pkgsrc/devel/py-gobject3
The problem is that the new sources have PYTHON_VERSIONS_INCOMPATIBLE
set to 27, but that doesn't error out before the py-cairo bl3 is
included.
Probably ${PYVERSSUFFIX} should just be quoted, so this doesn't have a
syntax error? With that, I get a "no valid python versions" error which
seems right.
Is this diff ok to commit?
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-cairo/buildlink3.mk,v
retrieving revision 1.31
diff -u -p -r1.31 buildlink3.mk
--- buildlink3.mk 3 Sep 2020 15:45:12 -0000 1.31
+++ buildlink3.mk 22 Sep 2022 12:11:17 -0000
@@ -9,7 +9,7 @@ PY_CAIRO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.py-cairo+= ${PYPKGPREFIX}-cairo>=1.10.0
BUILDLINK_ABI_DEPENDS.py-cairo?= ${PYPKGPREFIX}-cairo>=1.18.2nb1
-.if ${PYVERSSUFFIX} == "2.7"
+.if "${PYVERSSUFFIX}" == "2.7"
BUILDLINK_PKGSRCDIR.py-cairo?= ../../graphics/py-cairo118
.else
BUILDLINK_PKGSRCDIR.py-cairo?= ../../graphics/py-cairo
Attachment:
signature.asc
Description: PGP signature