public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Latest DBD::SQLite. Fix building against an external SQLite.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16138
This commit is contained in:
Eelco Dolstra 2009-07-02 13:55:38 +00:00
parent ce84af677b
commit fc34431dde
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/perl-modules/DBD-SQLite/default.nix
View File

@ -1,11 +1,11 @@
{fetchurl, buildPerlPackage, DBI, sqlite}: {fetchurl, buildPerlPackage, DBI, sqlite}:
buildPerlPackage { buildPerlPackage rec {
name = "DBD-SQLite-1.14"; name = "DBD-SQLite-1.25";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/M/MS/MSERGEANT/DBD-SQLite-1.14.tar.gz; url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
sha256 = "01qd5xfx702chg3bv2k727kfdp84zy5xh31y6njvivkp78vrs624"; sha256 = "17dd09jhf2kk33rqlsg74c1sb049qabmyh857alqc9fhffd1yb43";
}; };
propagatedBuildInputs = [DBI]; propagatedBuildInputs = [DBI];
@ -13,11 +13,11 @@ buildPerlPackage {
makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
patches = [ patches = [
# Prevent segfaults in case of timeouts. # Support building against our own sqlite.
./reset.patch ./external-sqlite.patch
]; ];
# Disabled because the tests can randomly fail due to timeouts # Disabled because the tests can randomly fail due to timeouts
# (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t").
doCheck = false; #doCheck = false;
} }

39
pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch Normal file
View File

@ -0,0 +1,39 @@
diff -rc DBD-SQLite-1.25-orig/Makefile.PL DBD-SQLite-1.25/Makefile.PL
*** DBD-SQLite-1.25-orig/Makefile.PL 2009-04-23 12:12:04.000000000 +0200
--- DBD-SQLite-1.25/Makefile.PL 2009-07-02 14:07:25.000000000 +0200
***************
*** 79,85 ****
# Let's find out the full story first, so we can make an informed
# decision to whether to do this. -- ADAMK
my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
! if ( 0 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
--- 79,85 ----
# Let's find out the full story first, so we can make an informed
# decision to whether to do this. -- ADAMK
my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
! if ( 1 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
***************
*** 141,148 ****
# Use always the bundled one.
# XXX: ... and this message should be more informative.
! $force_local = 1;
! print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
--- 141,148 ----
# Use always the bundled one.
# XXX: ... and this message should be more informative.
! #$force_local = 1;
! #print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );

40
pkgs/development/perl-modules/DBD-SQLite/reset.patch
View File

@ -1,40 +0,0 @@
diff -rc DBD-SQLite-1.14-orig/dbdimp.c DBD-SQLite-1.14/dbdimp.c
*** DBD-SQLite-1.14-orig/dbdimp.c 2007-08-24 04:51:25.000000000 +0200
--- DBD-SQLite-1.14/dbdimp.c 2008-11-10 18:31:53.000000000 +0100
***************
*** 398,405 ****
if (imp_sth->retval == SQLITE_ROW) {
continue;
}
! /* There are bug reports that say this should be sqlite3_reset() */
! sqlite3_finalize(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -5;
}
--- 398,404 ----
if (imp_sth->retval == SQLITE_ROW) {
continue;
}
! sqlite3_reset(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -5;
}
***************
*** 418,425 ****
case SQLITE_DONE: DBIc_ACTIVE_on(imp_sth);
sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth));
return 0;
! /* There are bug reports that say this should be sqlite3_reset() */
! default: sqlite3_finalize(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -6;
}
--- 417,423 ----
case SQLITE_DONE: DBIc_ACTIVE_on(imp_sth);
sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth));
return 0;
! default: sqlite3_reset(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -6;
}
Only in DBD-SQLite-1.14/: dbdimp.c~