Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/libdbi-drivers/files: libdbi-drivers-0.8.3-firebird-fix.patch libdbi-drivers-0.8.3-oracle-build-fix.patch
Date: Mon, 26 Oct 2009 07:19:35
Message-Id: E1N2JrY-0002Oj-RC@stork.gentoo.org
1 robbat2 09/10/26 07:19:32
2
3 Added: libdbi-drivers-0.8.3-firebird-fix.patch
4 libdbi-drivers-0.8.3-oracle-build-fix.patch
5 Log:
6 Bug #289519: Fixup for Firebird compile. Bug #256411: Fix for Oracle compile. Bug #254851: USE-default for tinderbox build.
7 (Portage version: 2.2_rc46/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch?rev=1.1&content-type=text/plain
14
15 Index: libdbi-drivers-0.8.3-firebird-fix.patch
16 ===================================================================
17 diff -Nuar libdbi-drivers-0.8.3-1.orig/acinclude.m4 libdbi-drivers-0.8.3-1/acinclude.m4
18 --- libdbi-drivers-0.8.3-1.orig/acinclude.m4 2007-12-30 11:05:40.000000000 +0000
19 +++ libdbi-drivers-0.8.3-1/acinclude.m4 2009-10-26 06:50:49.823477194 +0000
20 @@ -450,8 +450,8 @@
21 firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include"
22 AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir)
23 firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib"
24 -dnl AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
25 - AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
26 + AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
27 +dnl AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
28 if test "$ac_firebird_incdir" = "no"; then
29 AC_MSG_RESULT(no)
30 AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.])
31 @@ -479,8 +479,8 @@
32 [SCHAR_MSG="no"])
33 AC_MSG_RESULT([$SCHAR_MSG])
34
35 -dnl FIREBIRD_LIBS="-lfbclient"
36 - FIREBIRD_LIBS="-lfbembed"
37 + FIREBIRD_LIBS="-lfbclient"
38 +dnl FIREBIRD_LIBS="-lfbembed"
39 FIREBIRD_INCLUDE="-I$ac_firebird_incdir"
40 FIREBIRD_LDFLAGS="-L$ac_firebird_libdir"
41
42
43
44
45 1.1 dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch?rev=1.1&content-type=text/plain
49
50 Index: libdbi-drivers-0.8.3-oracle-build-fix.patch
51 ===================================================================
52 diff -urN libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c
53 --- libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c 2009-01-26 16:31:42.000000000 +0300
54 +++ libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c 2009-01-26 16:32:38.000000000 +0300
55 @@ -841,7 +841,7 @@
56 {
57 struct tm tmt;
58 /* char stime[101], *cp = NULL; */
59 -/* time_t loct = 0L; */
60 + time_t loct = 0L;
61
62 /* memset(stime, 0, sizeof(stime)); */