From: Jakub Bogusz Date: Fri, 18 Jul 2008 21:05:05 +0000 (+0000) Subject: - outdated X-Git-Tag: auto/th/Firebird-2_1_1_17910-1~8 X-Git-Url: http://git.pld-linux.org/?p=packages%2FFirebird.git;a=commitdiff_plain;h=934b60d40d5a896865c3b0d342178149c35686e5 - outdated Changed files: Firebird-fix-pthreads-detect.dpatch -> 1.3 Firebird-link-with-g++.dpatch -> 1.3 Firebird-no-custom-errno-and-sys_XXerrXX.dpatch -> 1.3 --- diff --git a/Firebird-fix-pthreads-detect.dpatch b/Firebird-fix-pthreads-detect.dpatch deleted file mode 100644 index 5f40ebe..0000000 --- a/Firebird-fix-pthreads-detect.dpatch +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 005_fix-pthreads-detect.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix pthreads detection - -@DPATCH@ - ---- firebird-1.5.4.4910/src/common/classes/locks.h.orig 2007-01-22 13:27:50.000000000 +0100 -+++ firebird-1.5.4.4910/src/common/classes/locks.h 2007-02-17 23:02:48.169652007 +0100 -@@ -29,24 +29,22 @@ - #include "firebird.h" - - #ifdef MULTI_THREAD --#ifdef WIN_NT -+#if defined(WIN_NT) - // It is relatively easy to avoid using this header. Maybe do the same stuff like - // in thd.h ? This is Windows platform maintainers choice - #include --#else --#ifndef SOLARIS --#include --#else -+#elif defined(SOLARIS) - #include - #include --#endif -+#else -+#include - #endif - #endif /* MULTI_THREAD */ - - namespace Firebird { - - #ifdef MULTI_THREAD --#ifdef WIN_NT -+#if defined(WIN_NT) - - /* Process-local spinlock. Used to manage memory heaps in threaded environment. */ - // Windows version of the class -@@ -77,7 +75,7 @@ - - /* Process-local spinlock. Used to manage memory heaps in threaded environment. */ - // Pthreads version of the class --#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) && !defined(AIX) && !defined(HPUX) -+#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) && !defined(AIX) && !defined(HPUX) && !defined(_POSIX_THREAD_IS_GNU_PTH) - class Spinlock { - private: - pthread_spinlock_t spinlock; -@@ -124,7 +122,7 @@ - system_call_failed::raise(); - } - }; --#else // DARWIN, FREEBSD, AIX, HPUX -+#else // DARWIN, FREEBSD, AIX, HPUX and gnu pth - class Spinlock { - private: - pthread_mutex_t mlock; diff --git a/Firebird-link-with-g++.dpatch b/Firebird-link-with-g++.dpatch deleted file mode 100644 index 9c3b73b..0000000 --- a/Firebird-link-with-g++.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 008_link-with-g++.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use g++ to link objects - -@DPATCH@ - ---- firebird-1.5.4.4910/builds/posix/make.rules.orig 2006-11-05 15:37:30.000000000 +0100 -+++ firebird-1.5.4.4910/builds/posix/make.rules 2007-02-17 23:05:38.259344867 +0100 -@@ -91,17 +91,17 @@ - ifdef UseLibToolForLink - - -- LIB_LINK= libtool $(CC( -- STATICLIB_LINK = libtool $(CC) -all-static -+ LIB_LINK= libtool $(CXX) -+ STATICLIB_LINK = libtool $(CXX) -all-static - # LIB_LINK_OPTIONS = -version-info 0:0:0 -release 1.5.0.0 -rpath /usr/lib - LIB_LINK_OPTIONS += -version-info 0:0:0 -release 1.5.0.0 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib - -- EXE_LINK = libtool $(CC) -- STATICEXE_LINK = libtool $(CC) -all-static -+ EXE_LINK = libtool $(CXX) -+ STATICEXE_LINK = libtool $(CXX) -all-static - else - - ifndef LIB_LINK -- LIB_LINK= $(CC) -+ LIB_LINK= $(CXX) - endif - - STATICLIB_LINK= ar cruvs diff --git a/Firebird-no-custom-errno-and-sys_XXerrXX.dpatch b/Firebird-no-custom-errno-and-sys_XXerrXX.dpatch deleted file mode 100644 index a01f552..0000000 --- a/Firebird-no-custom-errno-and-sys_XXerrXX.dpatch +++ /dev/null @@ -1,201 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 003_no-custom-errno-and-sys_XXerrXX.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove declarations of errno, syserrlist, sysnerr - -@DPATCH@ - ---- firebird-1.5.4.4910/src/jrd/gds.cpp.orig 2007-01-22 13:27:53.000000000 +0100 -+++ firebird-1.5.4.4910/src/jrd/gds.cpp 2007-02-17 23:09:07.007240730 +0100 -@@ -185,12 +185,6 @@ - - extern "C" { - --#if !(defined VMS || defined WIN_NT || defined LINUX || defined FREEBSD || defined NETBSD || defined DARWIN || defined AIX || defined HP11) --extern int errno; --extern SCHAR *sys_errlist[]; --extern int sys_nerr; --#endif -- - #ifndef PRINTF - #define PRINTF ib_printf - #endif -@@ -341,8 +335,6 @@ - #define ib_printf (*_libgds_printf) - #define ib_fopen (*_libgds_fopen) - #define ib_fclose (*_libgds_fclose) --#define sys_nerr (*_libgds_sys_nerr) --#define sys_errlist (*_libgds_sys_errlist) - #define malloc (*_libgds_malloc) - #define gettimeofday(*_libgds_gettimeofday) - #define ctime (*_libgds_ctime) -@@ -375,8 +367,6 @@ - extern int ib_printf(); - extern IB_FILE *ib_fopen(); - extern int ib_fclose(); --extern int sys_nerr; --extern SCHAR *sys_errlist[]; - extern void *malloc(); - extern int gettimeofday(); - extern SCHAR *ctime(); -@@ -963,14 +953,7 @@ - break; - - case gds_arg_unix: -- if (code > 0 && code < sys_nerr && (p = (TEXT*)sys_errlist[code])) -- strcpy(s, p); -- else if (code == 60) -- strcpy(s, "connection timed out"); -- else if (code == 61) -- strcpy(s, "connection refused"); -- else -- sprintf(s, "unknown unix error %ld", code); /* TXNN */ -+ sprintf(s, "%s", strerror (code)); - break; - - case gds_arg_dos: ---- firebird2-1.5.2.orig/src/jrd/shrinit.cpp -+++ firebird2-1.5.2/src/jrd/shrinit.cpp -@@ -70,8 +70,6 @@ - void (*_libgds_rewind) () = 0; - int (*_libgds_fseek) () = 0; - int (*_libgds__flsbuf) () = 0; --SCHAR(**_libgds_sys_errlist) = 0; --int *_libgds_sys_nerr = 0; - void *(*_libgds_malloc) () = 0; - int (*_libgds_gettimeofday) () = 0; - SCHAR *(*_libgds_ctime) () = 0; ---- firebird2-1.5.2.orig/src/extern/editline/sys.h -+++ firebird2-1.5.2/src/extern/editline/sys.h -@@ -124,11 +124,8 @@ - extern int fflush(FILE *); - extern int tolower(int); - extern int toupper(int); --extern int errno, sys_nerr; --extern char *sys_errlist[]; - extern void perror(const char *); - # include --# define strerror(e) sys_errlist[e] - # endif - # ifdef SABER - extern ptr_t memcpy(ptr_t, const ptr_t, size_t); ---- firebird2-1.5.2.orig/src/utilities/rebuild.cpp -+++ firebird2-1.5.2/src/utilities/rebuild.cpp -@@ -56,8 +56,6 @@ - - IB_FILE *dbg_file; - --extern SCHAR *sys_errlist[]; -- - static void checksum(RBDB, ULONG, ULONG, UCHAR); - static USHORT compute_checksum(RBDB, PAG); - static void db_error(int); -@@ -536,7 +534,7 @@ - * - **************************************/ - -- ib_printf(sys_errlist[status]); -+ ib_printf(strerror (status)); - exit(FINI_ERROR); - } - ---- firebird2-1.5.2.orig/src/utilities/analyse.cpp -+++ firebird2-1.5.2/src/utilities/analyse.cpp -@@ -47,8 +47,6 @@ - #include "jrd.h" - #include "ods.h" - --extern SCHAR *sys_errlist[]; -- - static void analyse(int, SCHAR *, PAG, int); - static SLONG get_long(void); - static void db_error(int); -@@ -290,7 +288,7 @@ - * - **************************************/ - -- ib_printf(sys_errlist[status]); -+ ib_printf(strerror (status)); - abort(); - } - ---- firebird2-1.5.2.orig/src/utilities/dba_full.epp -+++ firebird2-1.5.2/src/utilities/dba_full.epp -@@ -63,8 +63,6 @@ - - #if (defined WIN_NT) - #include --#else --extern SCHAR *sys_errlist[]; - #endif - - typedef struct dba_rel { -@@ -1122,7 +1120,7 @@ - tddba = GET_THREAD_DATA; - - #ifndef VMS -- FPRINTF(tddba->sw_outfile, "%s\n", sys_errlist[status]); -+ FPRINTF(tddba->sw_outfile, "%s\n", strerror (status)); - #else - if ((p = strerror(status)) || (p = strerror(EVMSERR, status))) - FPRINTF(tddba->sw_outfile, "%s\n", p); ---- firebird2-1.5.2.orig/src/utilities/sbc_print.cpp -+++ firebird2-1.5.2/src/utilities/sbc_print.cpp -@@ -69,10 +69,6 @@ - - #define DEFAULT_SIZE 8192 - --#if !(defined WIN_NT) --extern SCHAR *sys_errlist[]; --#endif -- - static void cache_init(void); - static void db_get_sbc(SCHAR *, SCHAR *, SLONG *, SSHORT *); - -@@ -490,7 +486,7 @@ - SCHAR *p; - - #ifndef VMS -- ib_printf(sys_errlist[status]); -+ ib_printf(strerror (status)); - #else - if ((p = strerror(status)) || (p = strerror(EVMSERR, status))) - ib_printf("%s\n", p); ---- firebird2-1.5.2.orig/src/utilities/dba.epp -+++ firebird2-1.5.2/src/utilities/dba.epp -@@ -1520,7 +1520,7 @@ - tddba->page_number = -1; - - #ifndef VMS -- FPRINTF(tddba->sw_outfile, "%s\n", sys_errlist[status]); -+ FPRINTF(tddba->sw_outfile, "%s\n", strerror (status)); - #else - if ((p = strerror(status)) || (p = strerror(EVMSERR, status))) - FPRINTF(tddba->sw_outfile, "%s\n", p); ---- firebird2-1.5.2.orig/src/lock/lock.cpp -+++ firebird2-1.5.2/src/lock/lock.cpp -@@ -338,14 +338,12 @@ - - - #ifdef SHLIB_DEFS --#define sys_errlist (*_libgds_sys_errlist) - #define waitpid (*_libgds_waitpid) - #define execl (*_libgds_execl) - #define _exit (*_libgds__exit) - #define statistics (*_libgds_stat) - #define chmod (*_libgds_chmod) - --extern SCHAR *sys_errlist[]; - extern int waitpid(); - extern int execl(); - extern void _exit(); -@@ -2067,7 +2065,7 @@ - - #if !(defined WIN_NT) - if (errno > 0) -- ib_fprintf(ib_stderr, "--%s\n", sys_errlist[errno]); -+ ib_fprintf(ib_stderr, "--%s\n", strerror (errno)); - #endif - - #ifdef DEV_BUILD