Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/
Date: Wed, 06 Dec 2017 20:15:28
Message-Id: 1512591297.e7b0cb0b12132fdc710a9ef12fbb53c1bbe21eec.asturm@gentoo
1 commit: e7b0cb0b12132fdc710a9ef12fbb53c1bbe21eec
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 6 19:58:45 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 6 20:14:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b0cb0b
7
8 dev-db/firebird: Fix build with GCC-6
9
10 Thanks-to: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>
11 Bug: https://bugs.gentoo.org/639614
12 Package-Manager: Portage-2.3.16, Repoman-2.3.6
13
14 dev-db/firebird/Manifest | 4 ++--
15 dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch | 2 +-
16 dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 2 ++
17 3 files changed, 5 insertions(+), 3 deletions(-)
18
19 diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
20 index b7e1145f12f..3335ecdfda5 100644
21 --- a/dev-db/firebird/Manifest
22 +++ b/dev-db/firebird/Manifest
23 @@ -1,3 +1,3 @@
24 -DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327 WHIRLPOOL d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
25 -DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6 WHIRLPOOL 2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd
26 +DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
27 +DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
28 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
29
30 diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
31 index f051ea02b4c..312f3576bcc 100644
32 --- a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
33 +++ b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
34 @@ -32,4 +32,4 @@ PR: https://github.com/FirebirdSQL/firebird/pull/104
35 + static_cast<SCHAR>(blr_end),
36 blr_eoc
37 };
38 - static FB_API_HANDLE req_handle;
39 \ No newline at end of file
40 + static FB_API_HANDLE req_handle;
41
42 diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
43 index b6e56990fd8..afe4c215521 100644
44 --- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
45 +++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
46 @@ -88,6 +88,8 @@ src_prepare() {
47 src_configure() {
48 filter-flags -fprefetch-loop-arrays
49 filter-mfpmath sse
50 + # bug 639614
51 + append-cxxflags -flifetime-dse=1 -fno-sized-deallocation -fno-delete-null-pointer-checks
52
53 econf \
54 --prefix=/usr/$(get_libdir)/firebird \