mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-06 06:30:19 +00:00
Switch to always using sqlite library from databases/sqlite3 port as
opposed to using the version of the library bundled with this port. Rationale: the recent versions of databases/sqlite3 introduced incompatible changes to the DB file format, and we'd like to keep interoperability between this port and databases/sqlite3. Reported by: edwin PR: 94668
This commit is contained in:
parent
b72452ff32
commit
1c6c0f63e2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=157965
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= DBD-SQLite
|
||||
PORTVERSION= 1.11
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= databases perl5
|
||||
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
|
||||
MASTER_SITE_SUBDIR= DBD
|
||||
@ -16,8 +16,16 @@ PKGNAMEPREFIX= p5-
|
||||
MAINTAINER= perl@FreeBSD.org
|
||||
COMMENT= Provides access to SQLite3 databases through the DBI
|
||||
|
||||
# We use sqlite3's own library & headers since it is more recent
|
||||
# than the bundled version and has an incompatible DB file format.
|
||||
# In this way we can be sure DBD::SQLite can interoperate with
|
||||
# databases/sqlite3.
|
||||
BUILD_DEPENDS= sqlite>=3.3.3:${PORTSDIR}/databases/sqlite3
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
|
||||
PERL_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= USE_LOCAL_SQLITE=yes
|
||||
CONFIGURE_ARGS+= USE_LOCAL_SQLITE=0
|
||||
CONFIGURE_ARGS+= SQLITE_LOCATION=${LOCALBASE}
|
||||
|
||||
MAN3= DBD::SQLite.3
|
||||
|
||||
@ -31,10 +39,9 @@ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
|
||||
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${RM} -f ${WRKSRC}/getsqlite.pl
|
||||
|
||||
post-patch:
|
||||
@${PERL} -i.bak -pe 's/\$$Config{d_usleep}/1/' ${WRKSRC}/Makefile.PL
|
||||
${RM} -f ${WRKSRC}/getsqlite.pl
|
||||
${PERL} -pi -e 's/\$$Config{d_usleep}/1/' ${WRKSRC}/Makefile.PL
|
||||
${PERL} -pi -e '$$_="" if m|getsqlite.pl|' ${WRKSRC}/MANIFEST
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
22
databases/p5-DBD-SQLite/files/patch-dbdimp.c
Normal file
22
databases/p5-DBD-SQLite/files/patch-dbdimp.c
Normal file
@ -0,0 +1,22 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- dbdimp.c.orig Wed Mar 22 15:21:16 2006
|
||||
+++ dbdimp.c Wed Mar 22 15:21:38 2006
|
||||
@@ -260,7 +260,7 @@ sqlite_st_prepare (SV *sth, imp_sth_t *i
|
||||
imp_sth->retval = SQLITE_OK;
|
||||
imp_sth->params = newAV();
|
||||
|
||||
- if ((retval = sqlite3_prepare(imp_dbh->db, statement, 0, &(imp_sth->stmt), &extra))
|
||||
+ if ((retval = sqlite3_prepare(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra))
|
||||
!= SQLITE_OK)
|
||||
{
|
||||
if (imp_sth->stmt) {
|
||||
@@ -320,7 +320,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *i
|
||||
psv = hv_fetch((HV*)SvRV(sth), "Statement", 9, 0);
|
||||
statement = (psv && SvOK(*psv)) ? SvPV_nolen(*psv) : "";
|
||||
sqlite_trace(3, "re-prepare statement %s", statement);
|
||||
- if ((retval = sqlite3_prepare(imp_dbh->db, statement, 0, &(imp_sth->stmt), &extra))
|
||||
+ if ((retval = sqlite3_prepare(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra))
|
||||
!= SQLITE_OK)
|
||||
{
|
||||
if (imp_sth->stmt) {
|
Loading…
Reference in New Issue
Block a user