pkgsrc-WIP-changes archive

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

py-weewx: Only depend on py-sqlite if it is present.



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Nov 22 13:19:16 2023 -0500
Changeset:	c20bfdccd8a7e51a48cb7bc66a9e12886bee3c32

Modified Files:
	py-weewx/Makefile

Log Message:
py-weewx: Only depend on py-sqlite if it is present.

pkgsrc merged py-sqlite3 into python after 2023Q3.  wip is used both
with the most recent stable branch and with pkgsrc-current.  Handle
this by adding a DEPENDS on py-sqlite3 if it is present in the
sources.

To be cleaned up when no longer needed; see comment in Makefile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c20bfdccd8a7e51a48cb7bc66a9e12886bee3c32

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

diffstat:
 py-weewx/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diffs:
diff --git a/py-weewx/Makefile b/py-weewx/Makefile
index 456e2fdba8..979d58a2f3 100644
--- a/py-weewx/Makefile
+++ b/py-weewx/Makefile
@@ -26,7 +26,14 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 # These versions are probably higher than necessary, but there is little value
 # in testing with versions older than are in pkgsrc.
+.if exists(../../databases/py-sqlite3/Makefile)
+# \todo After 2024-01-01 (such that 2023Q4 has been out long enough
+# that it is no longer reasonable to be using 2023Q3), drop this.
+# Until then, people using wip with the branch would have failures
+# that are perhaps hard to debug.
 DEPENDS+=	${PYPKGPREFIX}-sqlite3>=2.7.16:../../databases/py-sqlite3
+.endif
+
 DEPENDS+=	${PYPKGPREFIX}-Pillow>=6.0.0:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-cheetah>=3.0.0:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-configobj>=5.0.6:../../devel/py-configobj


Home | Main Index | Thread Index | Old Index