CVS commit: pkgsrc/databases/py-peewee

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 26 11:57:01 UTC 2018

Modified Files:
        pkgsrc/databases/py-peewee: Makefile distinfo
Added Files:
        pkgsrc/databases/py-peewee/patches: patch-setup.py

Log Message:
py-peewee: Find libsqlite3 correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/py-peewee/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/py-peewee/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/py-peewee/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/databases/py-peewee/Makefile
diff -u pkgsrc/databases/py-peewee/Makefile:1.45 pkgsrc/databases/py-peewee/Makefile:1.46
--- pkgsrc/databases/py-peewee/Makefile:1.45    Sun Oct  7 08:42:24 2018
+++ pkgsrc/databases/py-peewee/Makefile Fri Oct 26 11:57:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2018/10/07 08:42:24 adam Exp $
+# $NetBSD: Makefile,v 1.46 2018/10/26 11:57:01 jperkin Exp $
 
 DISTNAME=      peewee-3.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,6 +20,11 @@ MESSAGE_SUBST+=      PYPKGPREFIX=${PYPKGPREFI
 
 REPLACE_PYTHON+=       pwiz.py
 
+SUBST_CLASSES+=                lpath
+SUBST_STAGE.lpath=     pre-configure
+SUBST_FILES.lpath=     setup.py
+SUBST_VARS.lpath=      BUILDLINK_PREFIX.sqlite3
+
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 post-build:

Index: pkgsrc/databases/py-peewee/distinfo
diff -u pkgsrc/databases/py-peewee/distinfo:1.41 pkgsrc/databases/py-peewee/distinfo:1.42
--- pkgsrc/databases/py-peewee/distinfo:1.41    Sun Oct  7 08:42:24 2018
+++ pkgsrc/databases/py-peewee/distinfo Fri Oct 26 11:57:01 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.41 2018/10/07 08:42:24 adam Exp $
+$NetBSD: distinfo,v 1.42 2018/10/26 11:57:01 jperkin Exp $
 
 SHA1 (peewee-3.7.1.tar.gz) = 4781a13627eb4ac002faed854155316272c31bc7
 RMD160 (peewee-3.7.1.tar.gz) = 8106a17f8a749f5ac8b0d9673118eac1eb986163
 SHA512 (peewee-3.7.1.tar.gz) = 3d9ae7bf68c115a1a22f4f11460f2cb8c2f57be7757694ef4ee0d3d9d7f38c9b64f4be9afccbf7a17884b3feb0a38648b44daffe328eeb96dc5adb637aed36c6
 Size (peewee-3.7.1.tar.gz) = 2167702 bytes
+SHA1 (patch-setup.py) = 23575a58f42015a48b7503d90ed86290c92d0d03

Added files:

Index: pkgsrc/databases/py-peewee/patches/patch-setup.py
diff -u /dev/null pkgsrc/databases/py-peewee/patches/patch-setup.py:1.1
--- /dev/null   Fri Oct 26 11:57:01 2018
+++ pkgsrc/databases/py-peewee/patches/patch-setup.py   Fri Oct 26 11:57:01 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2018/10/26 11:57:01 jperkin Exp $
+
+Find libsqlite3.
+
+--- setup.py.orig      2018-08-30 19:16:58.000000000 +0000
++++ setup.py
+@@ -75,6 +75,7 @@ def _have_sqlite_extension_support():
+         compiler.link_executable(
+             compiler.compile([src_file], output_dir=tmp_dir),
+             bin_file,
++            library_dirs=['@BUILDLINK_PREFIX.sqlite3@/lib'],
+             libraries=['sqlite3'])
+     except CCompilerError:
+         print('unable to compile sqlite3 C extensions - missing headers?')