From dad0ac9a3fe3d4a2ad54b8e31e74cc6101ce78dc Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Tue, 20 Dec 2016 22:34:07 +0100
Subject: [PATCH] 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 9a3ccd0b8143..19db0eb6a84f 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 8306efed2eae..0de670852a01 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 9d62b792264c..a902386ca81f 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)
-- 
2.26.2