diff options
author | 2009-10-26 07:19:33 +0000 | |
---|---|---|
committer | 2009-10-26 07:19:33 +0000 | |
commit | 4409c531624183662c44ec915e4ab78740f65a6d (patch) | |
tree | 9207bcdec3fb8e9f440a6be14269ed568ebaf194 /dev-db/libdbi-drivers/files | |
parent | Version bump (includes fixes for #202765 #288227 #288863 and SPARC ptrace). (diff) | |
download | gentoo-2-4409c531624183662c44ec915e4ab78740f65a6d.tar.gz gentoo-2-4409c531624183662c44ec915e4ab78740f65a6d.tar.bz2 gentoo-2-4409c531624183662c44ec915e4ab78740f65a6d.zip |
Bug #289519: Fixup for Firebird compile. Bug #256411: Fix for Oracle compile. Bug #254851: USE-default for tinderbox build.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/libdbi-drivers/files')
-rw-r--r-- | dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch | 25 | ||||
-rw-r--r-- | dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch | 12 |
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch new file mode 100644 index 000000000000..6a5047466c2b --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch @@ -0,0 +1,25 @@ +diff -Nuar libdbi-drivers-0.8.3-1.orig/acinclude.m4 libdbi-drivers-0.8.3-1/acinclude.m4 +--- libdbi-drivers-0.8.3-1.orig/acinclude.m4 2007-12-30 11:05:40.000000000 +0000 ++++ libdbi-drivers-0.8.3-1/acinclude.m4 2009-10-26 06:50:49.823477194 +0000 +@@ -450,8 +450,8 @@ + firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include" + AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir) + firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib" +-dnl AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir) +- AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir) ++ AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir) ++dnl AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir) + if test "$ac_firebird_incdir" = "no"; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.]) +@@ -479,8 +479,8 @@ + [SCHAR_MSG="no"]) + AC_MSG_RESULT([$SCHAR_MSG]) + +-dnl FIREBIRD_LIBS="-lfbclient" +- FIREBIRD_LIBS="-lfbembed" ++ FIREBIRD_LIBS="-lfbclient" ++dnl FIREBIRD_LIBS="-lfbembed" + FIREBIRD_INCLUDE="-I$ac_firebird_incdir" + FIREBIRD_LDFLAGS="-L$ac_firebird_libdir" + diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch new file mode 100644 index 000000000000..ad73595a462b --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch @@ -0,0 +1,12 @@ +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 +--- libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c 2009-01-26 16:31:42.000000000 +0300 ++++ libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c 2009-01-26 16:32:38.000000000 +0300 +@@ -841,7 +841,7 @@ + { + struct tm tmt; + /* char stime[101], *cp = NULL; */ +-/* time_t loct = 0L; */ ++ time_t loct = 0L; + + /* memset(stime, 0, sizeof(stime)); */ + |