diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-08-14 06:44:31 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-08-15 02:57:09 (GMT) |
| commit | a1f5c6852cfce8978f0e3734db297a0e25a0bade (patch) | |
| tree | 64fc0493075240586687597f28cd891929f57743 | |
| parent | 47a2424cf890c1efef1e8bbf0bd61c28d43412c3 (diff) | |
| download | mxe-a1f5c6852cfce8978f0e3734db297a0e25a0bade.zip mxe-a1f5c6852cfce8978f0e3734db297a0e25a0bade.tar.gz mxe-a1f5c6852cfce8978f0e3734db297a0e25a0bade.tar.bz2 | |
gtkimageview guile libssh: fix gcc5 unrecognised options
| -rw-r--r-- | plugins/gcc7/gcc7-overlay.mk | 6 | ||||
| -rw-r--r-- | src/gtkimageview.mk | 2 | ||||
| -rw-r--r-- | src/guile.mk | 2 | ||||
| -rw-r--r-- | 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 e174ed3..6e5269b 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 d102b22..79821f5 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 6825cca..4599fc4 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 14045d6..9700fe0 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` |