commit: 355d4ca8b41c04262f89c52cb3063a6697e930eb Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Sun Mar 25 21:15:49 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 4 21:09:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355d4ca8
games-engines/zoom: Fix building with GCC-7 Bug: https://bugs.gentoo.org/617808 Package-Manager: Portage-2.3.16, Repoman-2.3.6 Closes: https://bugs.gentoo.org/617808 Closes: https://github.com/gentoo/gentoo/pull/7617 Closes: https://github.com/gentoo/gentoo/pull/7617 games-engines/zoom/files/zoom-1.1.5-gcc7.patch | 53 ++++++++++++++++++++++++++ games-engines/zoom/zoom-1.1.5-r1.ebuild | 4 +- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/games-engines/zoom/files/zoom-1.1.5-gcc7.patch b/games-engines/zoom/files/zoom-1.1.5-gcc7.patch new file mode 100644 index 00000000000..6f50d3f4362 --- /dev/null +++ b/games-engines/zoom/files/zoom-1.1.5-gcc7.patch @@ -0,0 +1,53 @@ +Bug: https://bugs.gentoo.org/617808 +Upstream commit: https://github.com/Logicalshift/zoom/commit/6b0ad57dd2c125c9126e9b7913560ad25709a36f + +From 6b0ad57dd2c125c9126e9b7913560ad25709a36f Mon Sep 17 00:00:00 2001 +From: Andrew Hunter <and...@logicalshift.co.uk> +Date: Sat, 3 Mar 2012 16:31:35 +0000 +Subject: [PATCH] Inline functions need to be marked as static in order to + compile with LLVM + +--- + src/interp.c | 4 ++-- + src/tokenise.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/interp.c b/src/interp.c +index a5fa8fe..3d446fa 100644 +--- a/src/interp.c ++++ b/src/interp.c +@@ -232,7 +232,7 @@ ZFrame* call_routine(ZDWord* pc, ZStack* stack, ZDWord start) + return newframe; + } + +-inline void store(ZStack* stack, int var, ZWord value) ++static inline void store(ZStack* stack, int var, ZWord value) + { + #ifdef DEBUG + printf_debug("Storing %i in Variable #%x\n", value, var); +@@ -253,7 +253,7 @@ inline void store(ZStack* stack, int var, ZWord value) + } + } + +-inline void store_nopush(ZStack* stack, int var, ZWord value) ++static inline void store_nopush(ZStack* stack, int var, ZWord value) + { + #ifdef DEBUG + printf_debug("Storing %i in Variable #%x\n", value, var); +diff --git a/src/tokenise.c b/src/tokenise.c +index 5925169..fb442d0 100644 +--- a/src/tokenise.c ++++ b/src/tokenise.c +@@ -154,9 +154,9 @@ ZDictionary* dictionary_cache(const ZUWord dict_pos) + + int cache = 1; + +-inline ZUWord lookup_word(unsigned int* word, +- int wordlen, +- ZUWord dct) ++static inline ZUWord lookup_word(unsigned int* word, ++ int wordlen, ++ ZUWord dct) + { + ZByte packed[12]; + int zscii_len; diff --git a/games-engines/zoom/zoom-1.1.5-r1.ebuild b/games-engines/zoom/zoom-1.1.5-r1.ebuild index 20d982f0281..1f5085ae61d 100644 --- a/games-engines/zoom/zoom-1.1.5-r1.ebuild +++ b/games-engines/zoom/zoom-1.1.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,6 +22,8 @@ DEPEND="${RDEPEND} dev-lang/perl x11-proto/xextproto" +PATCHES=( "${FILESDIR}"/${P}-gcc7.patch ) + src_install() { default dodoc -r manual/*
