Update py-apsw to 3.34.0 and switch to py3-only
OK sthen@
This commit is contained in:
rsadowski
parent
0da4db0002
commit
c293dd0c46
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.418 2021/02/24 02:22:02 daniel Exp $
|
||||
# $OpenBSD: Makefile,v 1.419 2021/02/24 14:10:48 rsadowski Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += architect
|
||||
@ -153,7 +153,6 @@
|
||||
SUBDIR += postgresql-plr
|
||||
SUBDIR += postgresql_autodoc
|
||||
SUBDIR += puppetdb5
|
||||
SUBDIR += py-apsw
|
||||
SUBDIR += py-apsw,python3
|
||||
SUBDIR += py-bsddb3
|
||||
SUBDIR += py-bsddb3,python3
|
||||
|
||||
@ -1,28 +1,29 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2021/01/04 14:06:27 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2021/02/24 14:10:48 rsadowski Exp $
|
||||
|
||||
COMMENT = thin SQLite wrapper for Python
|
||||
|
||||
MODPY_EGG_VERSION = 3.9.2
|
||||
DISTNAME = apsw-${MODPY_EGG_VERSION}-r1
|
||||
MODPY_PI_DIR= a/apsw
|
||||
MODPY_EGG_VERSION = 3.34.0
|
||||
DISTVERSIONSUFFIX = -r1
|
||||
DISTNAME = apsw-${MODPY_EGG_VERSION}${DISTVERSIONSUFFIX}
|
||||
PKGNAME = py-apsw-${MODPY_EGG_VERSION}
|
||||
CATEGORIES = databases
|
||||
REVISION = 2
|
||||
|
||||
HOMEPAGE= https://rogerbinns.github.io/apsw/
|
||||
HOMEPAGE = https://rogerbinns.github.io/apsw/
|
||||
|
||||
# zlib
|
||||
PERMIT_PACKAGE= Yes
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
MASTER_SITES = https://github.com/rogerbinns/apsw/releases/download/${MODPY_EGG_VERSION}${DISTVERSIONSUFFIX}/
|
||||
|
||||
EXTRACT_SUFX = .zip
|
||||
|
||||
WANTLIB += ${MODPY_WANTLIB} pthread sqlite3
|
||||
|
||||
LIB_DEPENDS = databases/sqlite3
|
||||
|
||||
MODULES = lang/python
|
||||
MODPY_PI= Yes
|
||||
|
||||
FLAVORS = python3
|
||||
FLAVOR ?=
|
||||
FLAVOR = python3
|
||||
|
||||
MODPY_DISTUTILS_BUILDARGS = build_ext -I${LOCALBASE}/include
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (apsw-3.9.2-r1.tar.gz) = 2rlv0WTd6eWffycigpFJghf6DnQEjiwIxwWdfjlYknA=
|
||||
SIZE (apsw-3.9.2-r1.tar.gz) = 2607431
|
||||
SHA256 (apsw-3.34.0-r1.zip) = LSWP22jYdwPI+Xv8nVq2iCoCR/aSMENbLcfOpbUODY4=
|
||||
SIZE (apsw-3.34.0-r1.zip) = 682680
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-setup_py,v 1.1 2017/08/10 17:27:34 sthen Exp $
|
||||
$OpenBSD: patch-setup_py,v 1.2 2021/02/24 14:10:48 rsadowski Exp $
|
||||
|
||||
Index: setup.py
|
||||
--- setup.py.orig
|
||||
+++ setup.py
|
||||
@@ -139,7 +139,7 @@ class build_test_extension(Command):
|
||||
shared="shared"
|
||||
@@ -166,7 +166,7 @@ class build_test_extension(Command):
|
||||
shared = "shared"
|
||||
if sys.platform.startswith("darwin"):
|
||||
shared="bundle"
|
||||
- res=os.system("gcc -fPIC -%s -o testextension.sqlext -Isqlite3 -I. src/testextension.c" % (shared,))
|
||||
+ res=os.system("cc -fPIC -%s -o testextension.sqlext -Isqlite3 -I. src/testextension.c" % (shared,))
|
||||
if res!=0:
|
||||
shared = "bundle"
|
||||
- res = os.system("gcc -fPIC -%s -o testextension.sqlext -Isqlite3 -I. src/testextension.c" % (shared, ))
|
||||
+ res = os.system("cc -fPIC -%s -o testextension.sqlext -Isqlite3 -I. src/testextension.c" % (shared, ))
|
||||
if res != 0:
|
||||
raise RuntimeError("Building test extension failed")
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-tests_py,v 1.2 2017/08/10 17:27:34 sthen Exp $
|
||||
$OpenBSD: patch-tests_py,v 1.3 2021/02/24 14:10:48 rsadowski Exp $
|
||||
|
||||
>>> print apsw.sqlite3_sourceid()
|
||||
OpenBSD
|
||||
@ -6,21 +6,15 @@ OpenBSD
|
||||
Index: tests.py
|
||||
--- tests.py.orig
|
||||
+++ tests.py
|
||||
@@ -426,7 +426,7 @@ class APSW(unittest.TestCase):
|
||||
apsw.SQLITE_FCNTL_SIZE_HINT
|
||||
apsw.mapping_file_control["SQLITE_FCNTL_SIZE_HINT"]==apsw.SQLITE_FCNTL_SIZE_HINT
|
||||
apsw.URIFilename
|
||||
- self.assertTrue(len(apsw.sqlite3_sourceid())>10)
|
||||
+ self.assertTrue(len(apsw.sqlite3_sourceid())>=7)
|
||||
|
||||
def testConnection(self):
|
||||
"Test connection opening"
|
||||
@@ -8229,7 +8229,7 @@ def setup(write=write):
|
||||
@@ -8677,9 +8677,9 @@ def setup(write=write):
|
||||
if getattr(memdb, "enableloadextension", None) and not os.path.exists(LOADEXTENSIONFILENAME):
|
||||
write("Not doing LoadExtension test. You need to compile the extension first\n")
|
||||
if sys.platform.startswith("darwin"):
|
||||
write(" gcc -fPIC -bundle -o "+LOADEXTENSIONFILENAME+" -I. -Isqlite3 src/testextension.c\n")
|
||||
- write(" gcc -fPIC -bundle -o " + LOADEXTENSIONFILENAME + " -I. -Isqlite3 src/testextension.c\n")
|
||||
+ write(" cc -fPIC -bundle -o " + LOADEXTENSIONFILENAME + " -I. -Isqlite3 src/testextension.c\n")
|
||||
else:
|
||||
- write(" gcc -fPIC -shared -o "+LOADEXTENSIONFILENAME+" -I. -Isqlite3 src/testextension.c\n")
|
||||
+ write(" cc -fPIC -shared -o "+LOADEXTENSIONFILENAME+" -I. -Isqlite3 src/testextension.c\n")
|
||||
- write(" gcc -fPIC -shared -o " + LOADEXTENSIONFILENAME + " -I. -Isqlite3 src/testextension.c\n")
|
||||
+ write(" cc -fPIC -shared -o " + LOADEXTENSIONFILENAME + " -I. -Isqlite3 src/testextension.c\n")
|
||||
del APSW.testLoadExtension
|
||||
sys.stdout.flush()
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2021/01/04 14:06:27 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2021/02/24 14:10:48 rsadowski Exp $
|
||||
@pkgpath databases/py-apsw
|
||||
lib/python${MODPY_VERSION}/site-packages/apsw-${MODPY_EGG_VERSION}_r1-py${MODPY_VERSION}.egg-info
|
||||
@so lib/python${MODPY_VERSION}/site-packages/apsw.${MODPY_PYC_MAGIC_TAG}so
|
||||
|
||||
Loading…
Reference in New Issue
Block a user