[gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/

[David Seifert]

commit:     dad0ac9a3fe3d4a2ad54b8e31e74cc6101ce78dc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 21:34:07 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 21:34:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad0ac9a

sys-fs/squashfs-tools: Fix building with GCC 5

Gentoo-bug: 595290

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild | 6 +++++-
 sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild | 6 +++++-
 sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild    | 9 +++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild 
b/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild
index 9a3ccd0..19db0eb 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DEB_VER="3"
 
@@ -40,6 +40,10 @@ src_prepare() {
 use10() { usex $1 1 0 ; }
 
 src_configure() {
+       # restore GNU89 inline semantics to
+       # emit function symbols, bug 595290
+       append-cflags -std=gnu89
+
        # set up make command line variables in EMAKE_SQUASHFS_CONF
        EMAKE_SQUASHFS_CONF=(
                LZMA_XZ_SUPPORT=$(use10 lzma)

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild 
b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
index 8306efe..0de6708 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 DEB_VER="3"
 
@@ -43,6 +43,10 @@ src_prepare() {
 use10() { usex $1 1 0 ; }
 
 src_configure() {
+       # restore GNU89 inline semantics to
+       # emit function symbols, bug 595290
+       append-cflags -std=gnu89
+
        # set up make command line variables in EMAKE_SQUASHFS_CONF
        EMAKE_SQUASHFS_CONF=(
                LZMA_XZ_SUPPORT=$(use10 lzma)

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild 
b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index 9d62b79..a902386 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit eutils toolchain-funcs
+
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
 HOMEPAGE="http://squashfs.sourceforge.net";
@@ -34,6 +35,10 @@ src_prepare() {
 use10() { usex $1 1 2 ; }
 
 src_configure() {
+       # restore GNU89 inline semantics to
+       # emit function symbols, bug 595290
+       append-cflags -std=gnu89
+
        # set up make command line variables in EMAKE_SQUASHFS_CONF
        EMAKE_SQUASHFS_CONF=(
                LZMA_XZ_SUPPORT=$(use10 lzma)