From a1f5c6852cfce8978f0e3734db297a0e25a0bade Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 14 Aug 2018 16:44:31 +1000
Subject: [PATCH] gtkimageview guile libssh: fix gcc5 unrecognised options

---
 plugins/gcc7/gcc7-overlay.mk | 6 ++++++
 src/gtkimageview.mk          | 2 +-
 src/guile.mk                 | 2 +-
 src/libssh.mk                | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/gcc7/gcc7-overlay.mk b/plugins/gcc7/gcc7-overlay.mk
index e174ed3e..6e5269b8 100644
--- a/plugins/gcc7/gcc7-overlay.mk
+++ b/plugins/gcc7/gcc7-overlay.mk
@@ -23,3 +23,9 @@ $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_PATCHES  := $(dir $(lastword $(MAKEFILE_LIST)))/gcc7.patch
+
+# set these in respective makefiles when gcc7 becomes default
+# and leave them blank for gcc5 plugin
+libssh_EXTRA_WARNINGS = -Wno-error=implicit-fallthrough
+gtkimageview_EXTRA_WARNINGS = -Wno-error=misleading-indentation
+guile_EXTRA_WARNINGS = -Wno-error=misleading-indentation
diff --git a/src/gtkimageview.mk b/src/gtkimageview.mk
index d102b220..79821f59 100644
--- a/src/gtkimageview.mk
+++ b/src/gtkimageview.mk
@@ -31,7 +31,7 @@ define $(PKG)_BUILD
         --disable-gtk-doc \
         GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \
         GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums' \
-        CFLAGS='-Wno-error=deprecated-declarations -Wno-error=misleading-indentation -std=c99'
+        CFLAGS='-Wno-error=deprecated-declarations $($(PKG)_EXTRA_WARNINGS) -std=c99'
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
diff --git a/src/guile.mk b/src/guile.mk
index 6825ccae..4599fc44 100644
--- a/src/guile.mk
+++ b/src/guile.mk
@@ -29,7 +29,7 @@ define $(PKG)_BUILD
         --without-threads \
         scm_cv_struct_timespec=no \
         LIBS='-lunistring -lintl -liconv -ldl' \
-        CFLAGS='-Wno-unused-but-set-variable -Wno-unused-value -Wno-error=misleading-indentation'
+        CFLAGS='-Wno-unused-but-set-variable -Wno-unused-value $($(PKG)_EXTRA_WARNINGS)'
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) schemelib_DATA=
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_CRUFT) schemelib_DATA=
 
diff --git a/src/libssh.mk b/src/libssh.mk
index 14045d6f..9700fe0d 100644
--- a/src/libssh.mk
+++ b/src/libssh.mk
@@ -55,7 +55,7 @@ define $(PKG)_BUILD
 
     # compile test
     '$(TARGET)-gcc' \
-        -W -Wall -Werror -pedantic -Wno-error=implicit-fallthrough \
+        -W -Wall -Werror -pedantic $($(PKG)_EXTRA_WARNINGS) \
         $(SOURCE_DIR)/examples/{authentication.c,knownhosts.c,connect_ssh.c,exec.c} \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`