OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Sep-2006 21:26:49
Branch: OPENPKG_2_STABLE Handle: 2006092020264800
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
MFC: recent fixes for Solaris
Summary:
Revision Changes Path
1.18.2.1 +49 -13 openpkg-src/perl-dbi/perl-dbi.patch
1.202.2.2 +8 -8 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.18 -r1.18.2.1 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 7 Jun 2006 07:59:40 -0000
1.18
+++ openpkg-src/perl-dbi/perl-dbi.patch 20 Sep 2006 19:26:48 -0000
1.18.2.1
@@ -1,8 +1,8 @@
-Index: DBD-SQLite-1.12/Makefile.PL
---- DBD-SQLite-1.12/Makefile.PL.orig 2005-06-20 14:45:11 +0200
-+++ DBD-SQLite-1.12/Makefile.PL 2005-06-21 21:02:43 +0200
-@@ -7,34 +7,6 @@
- use ExtUtils::MakeMaker;
+Index: DBD-SQLite-1.13/Makefile.PL
+--- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13.000000000 +0200
++++ DBD-SQLite-1.13/Makefile.PL 2006-09-19 20:05:27.104172279 +0200
+@@ -10,34 +10,6 @@
+ }
use Config;
use strict;
-eval {
@@ -36,20 +36,56 @@
# 2005/6/19, by [EMAIL PROTECTED]
#
-@@ -113,8 +85,9 @@
+@@ -111,18 +83,19 @@
+
+ my $nlid = $DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id';
+
+-my $libs = '';
+-$libs .= "-L$sqlite_lib " if ($sqlite_lib);
+-$libs .= "-lsqlite3 " unless ($force_local);
++my $inc = [EMAIL PROTECTED]@/bin/pkg-config sqlite3 --cflags-only-I`;
++$inc =~ s/\r?\n$//s;
++my $libs = [EMAIL PROTECTED]@/bin/pkg-config sqlite3 --libs`;
++$libs =~ s/\r?\n$//s;
+
+ WriteMakefile(
+ 'NAME' => 'DBD::SQLite',
'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
- 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' .
-+ 'INC' => '[EMAIL PROTECTED]@/include -I$(DBI_INSTARCH_DIR)' .
++ 'INC' => $inc . ' -I. -I$(DBI_INSTARCH_DIR)' .
(($sqlite_inc) ? " -I$sqlite_inc" : ''),
-+ 'LIBS' => ['[EMAIL PROTECTED]@/lib -lsqlite3'],
- $force_local ? () : ('LIBS' => '-lsqlite3'),
- $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) :
(),
+- $libs ? ('LIBS' => $libs) : (),
++ 'LIBS' => [ $libs ],
'OPTIMIZE' => "-O2",
-Index: DBD-SQLite-1.12/dbdimp.h
---- DBD-SQLite-1.12/dbdimp.h.orig 2004-09-10 17:24:28 +0200
-+++ DBD-SQLite-1.12/dbdimp.h 2005-06-21 21:01:54 +0200
+ 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
+ ( ($Config{d_usleep} ||
+Index: DBD-SQLite-1.13/dbdimp.c
+--- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50.000000000 +0200
++++ DBD-SQLite-1.13/dbdimp.c 2006-09-19 20:03:45.164447005 +0200
+@@ -394,14 +394,17 @@
+
+ sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
+ if (DBIc_NUM_FIELDS(imp_sth) == 0) {
++ char *defererr = strdup((char*)sqlite3_errmsg(imp_dbh->db));
+ while ((retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) {
+ if (retval == SQLITE_ROW) {
+ continue;
+ }
+ sqlite3_finalize(imp_sth->stmt);
+- sqlite_error(sth, (imp_xxh_t*)imp_sth, retval,
(char*)sqlite3_errmsg(imp_dbh->db));
++ sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, defererr);
++ free(defererr);
+ return -5;
+ }
++ free(defererr);
+ /* warn("Finalize\n"); */
+ sqlite3_reset(imp_sth->stmt);
+ imp_sth->nrow = sqlite3_changes(imp_dbh->db);
+Index: DBD-SQLite-1.13/dbdimp.h
+--- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50.000000000 +0200
++++ DBD-SQLite-1.13/dbdimp.h 2006-09-19 20:03:45.164783426 +0200
@@ -4,7 +4,7 @@
#define _DBDIMP_H 1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.202.2.1 -r1.202.2.2 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 20 Jun 2006 15:22:58 -0000
1.202.2.1
+++ openpkg-src/perl-dbi/perl-dbi.spec 20 Sep 2006 19:26:48 -0000
1.202.2.2
@@ -24,20 +24,20 @@
# versions of individual parts
%define V_perl 5.8.8
-%define V_dbi 1.51
+%define V_dbi 1.52
%define V_sql_statement 1.15
%define V_sql_abstract 1.21
%define V_sql_routine 0.70.3
%define V_sql_builder 0.033
%define V_sql_interpolate 0.33
-%define V_dbd_mock 1.32
+%define V_dbd_mock 1.34
%define V_dbd_anydata 0.08
%define V_dbd_csv 0.22
-%define V_dbd_sprite 0.56
-%define V_dbd_sqlite 1.12
-%define V_dbd_mysql 3.0006
+%define V_dbd_sprite 0.58
+%define V_dbd_sqlite 1.13
+%define V_dbd_mysql 3.0007
%define V_dbd_pgsql 1.49
-%define V_dbd_oracle 1.17
+%define V_dbd_oracle 1.18a
%define V_dbd_sybase 1.07_01
%define V_dbd_odbc 1.13
@@ -52,7 +52,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.20060622
+Release: 2.20060920
# package options
%option with_dbd_sqlite yes
@@ -84,7 +84,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.20060622, perl >= %{V_perl},
perl-openpkg >= %{V_perl}-2.20060622
+BuildPreReq: OpenPKG, openpkg >= 2.20060622, perl >= %{V_perl},
perl-openpkg >= %{V_perl}-2.20060622, pkgconfig
PreReq: OpenPKG, openpkg >= 2.20060622, perl >= %{V_perl}
BuildPreReq: perl-module, perl-util, perl-net, perl-locale, perl-text
PreReq: perl-module, perl-util, perl-net, perl-locale, perl-text
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
