diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 19:21:14 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 19:21:32 +0200 |
| commit | 31b13ed9ef5c46e732208be17d7c90c3af89ed42 (patch) | |
| tree | 030f8fa3948a429f7e0f5f58111c0aa6a486d6b4 /external | |
| parent | 5dad45d798eaaeaa4c6e480e4ce4cd06964e7a1f (diff) | |
firebird: gcc6 compatibility part 1
Change-Id: I4fbb131a629275626510d5311550e8bf8cdef6d5
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | external/firebird/firebird-gcc6.patch.1 | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 5715d0c17288..f015a911ccd3 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-Engine12.patch \ external/firebird/firebird-rpath.patch.0 \ external/firebird/firebird-cloop-compiler.patch.1 \ + external/firebird/firebird-gcc6.patch.1 \ )) ifeq ($(OS)-$(COM),WNT-MSC) diff --git a/external/firebird/firebird-gcc6.patch.1 b/external/firebird/firebird-gcc6.patch.1 new file mode 100644 index 000000000000..e1361415c03b --- /dev/null +++ b/external/firebird/firebird-gcc6.patch.1 @@ -0,0 +1,19 @@ +commit 3618aa2171674babf79ef935aa049c40a3db1321 +Author: asfernandes <asfernandes@users.sourceforge.net> +Date: Sat Mar 5 03:39:36 2016 +0000 + + Make the generated code compatible with gcc 6 in C++-14 mode. + +diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp +index 2af96c6..2dcffd6 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) |