firebird:update
This commit is contained in:
alihanozturk
@@ -13,6 +13,8 @@ from pisi.actionsapi import get
|
||||
WorkDir="Firebird-%s-0" % get.srcVERSION()
|
||||
|
||||
def setup():
|
||||
shelltools.export("CFLAGS", "%s -fno-strict-aliasing" % get.CFLAGS())
|
||||
shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
|
||||
pisitools.dosed("src/isql/isql.epp", '"isql\s', '"fbsql ')
|
||||
pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ')
|
||||
pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ')
|
||||
@@ -32,6 +34,7 @@ def setup():
|
||||
|
||||
def build():
|
||||
#Parallel build is broken
|
||||
shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
|
||||
autotools.make("-j1")
|
||||
shelltools.cd("gen")
|
||||
pisitools.dosed("install/makeInstallImage.sh", "exit 1", "# exit 1")
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
# Author: Adriano dos Santos Fernandes
|
||||
#Index: src/common/classes/alloc.h
|
||||
#===================================================================
|
||||
#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
|
||||
#retrieving revision 1.71
|
||||
diff -u -p -r1.71 alloc.h
|
||||
--- Firebird-2.5.6.27020-0/src/common/classes/alloc.h.orig 26 Sep 2007 17:48:20 -0000 1.71
|
||||
+++ Firebird-2.5.6.27020-0/src/common/classes/alloc.h 20 May 2009 02:20:08 -0000
|
||||
@@ -48,6 +48,7 @@
|
||||
#include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
|
||||
stdlib.h (EKU) */
|
||||
#endif
|
||||
+#include <new>
|
||||
|
||||
// MSVC does not support exception specification, so it's unknown if that will be correct or not
|
||||
// from its POV. For now, use it and disable the C4290 warning.
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From: asfernandes <asfernandes@users.sourceforge.net>
|
||||
Date: Sat, 5 Mar 2016 03:39:36 +0000
|
||||
Subject: Make the generated code compatible with gcc 6 in C++-14 mode.
|
||||
(cherry picked from commit 3618aa2171674babf79ef935aa049c40a3db1321)
|
||||
Patch-mainline:
|
||||
Git-commit: 3618aa2171674babf79ef935aa049c40a3db1321
|
||||
References: bsc#964466 CORE-5099
|
||||
|
||||
---
|
||||
src/gpre/c_cxx.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
|
||||
index df175dca9465..bafce8f282bf 100644
|
||||
--- a/src/gpre/c_cxx.cpp
|
||||
+++ b/src/gpre/c_cxx.cpp
|
||||
@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
|
||||
printa(0, "static %sshort\n isc_%dl = %d;",
|
||||
(request->req_flags & REQ_extend_dpb) ? "" : CONST_STR,
|
||||
request->req_ident, request->req_length);
|
||||
- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident);
|
||||
+ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident);
|
||||
|
||||
const TEXT* string_type = "blr";
|
||||
if (gpreGlob.sw_raw)
|
||||
--
|
||||
2.8.2
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
From: Michal Kubecek <mkubecek@suse.cz>
|
||||
Date: Mon, 25 Apr 2016 08:55:36 +0200
|
||||
Subject: Provide sized global delete operators when compiled in C++14 mode
|
||||
Patch-mainline: submitted
|
||||
Git-commit: 038f9fbf559e56032e4cb49eb7ce4c3ead23fda9
|
||||
References: bsc#964466 CORE-5099
|
||||
|
||||
---
|
||||
src/common/classes/alloc.h | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h
|
||||
index b1026ce2aac4..fda5bfebb0cc 100644
|
||||
--- a/src/common/classes/alloc.h
|
||||
+++ b/src/common/classes/alloc.h
|
||||
@@ -331,6 +331,16 @@ inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS
|
||||
MemoryPool::globalFree(mem);
|
||||
}
|
||||
|
||||
+#if __cplusplus >= 201402L
|
||||
+inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) throw()
|
||||
+{
|
||||
+ MemoryPool::globalFree(mem);
|
||||
+}
|
||||
+inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw()
|
||||
+{
|
||||
+ MemoryPool::globalFree(mem);
|
||||
+}
|
||||
+#endif
|
||||
#ifdef DEBUG_GDS_ALLOC
|
||||
|
||||
#ifdef __clang__
|
||||
--
|
||||
2.8.2
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A relational database offering many ANSI SQL-99 features</Summary>
|
||||
<Description>Firebird is an open source relational database management system offering many ANSI SQL-99 features.</Description>
|
||||
<Archive sha1sum="e8f33daf8211666eac5b7a5eecc133f599e3bc9f" type="tarbz2">http://sourceforge.net/projects/firebird/files/firebird/2.5.4-Release/Firebird-2.5.4.26856-0.tar.bz2</Archive>
|
||||
<Archive sha1sum="985848a4f6bd2f9e4e591aff726b567eee873d2b" type="tarbz2">http://sourceforge.net/projects/firebird/files/firebird/2.5.6-Release/Firebird-2.5.6.27020-0.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>icu4c-devel</Dependency>
|
||||
<Dependency>btyacc</Dependency>
|
||||
@@ -29,6 +29,9 @@
|
||||
<Patch level="1">firebird-2.5.1-svn-CORE-3610.patch</Patch>-->
|
||||
<Patch level="1">editline-dumb-tr.patch</Patch>
|
||||
<Patch level="1">firebird-2.5.1.26351.0-deps-flags.patch</Patch>
|
||||
<Patch level="1">Provide-sized-global-delete-operators-when-compiled.patch</Patch>
|
||||
<Patch level="1">Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch</Patch>
|
||||
<Patch level="1">Firebird-gcc-icu.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -103,9 +106,9 @@
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-02-15</Date>
|
||||
<Version>2.5.4.26856</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Date>2017-02-18</Date>
|
||||
<Version>2.5.6.27020</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
|
||||
Reference in New Issue
Block a user