zepto-forks/meta-retro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opentyrian: fix build with gcc7

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-06-30 11:22:01 +02:00
parent e328d684cc
commit d9445af61a
2 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
recipes-games/opentyrian/files/0004-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch Normal file
View File

@@ -0,0 +1,73 @@
From 229d704ce2958ed22ca3ece49169bf1b1b97163d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 30 Jun 2017 11:15:40 +0200
Subject: [PATCH] increase buffer size to avoid gcc7 format-overflow errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/episodes.c | 2 +-
src/episodes.h | 2 +-
src/lvllib.c | 2 +-
src/lvllib.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/episodes.c b/src/episodes.c
index 796d531..f346641 100644
--- a/src/episodes.c
+++ b/src/episodes.c
@@ -41,7 +41,7 @@ JE_EnemyDatType enemyDat;
/* EPISODE variables */
JE_byte initial_episode_num, episodeNum = 0;
JE_boolean episodeAvail[EPISODE_MAX]; /* [1..episodemax] */
-char episode_file[13], cube_file[13];
+char episode_file[15], cube_file[15];
JE_longint episode1DataLoc;
diff --git a/src/episodes.h b/src/episodes.h
index 598e1ae..0ff4380 100644
--- a/src/episodes.h
+++ b/src/episodes.h
@@ -162,7 +162,7 @@ extern JE_EnemyDatType enemyDat;
extern JE_byte initial_episode_num, episodeNum;
extern JE_boolean episodeAvail[EPISODE_MAX];
-extern char episode_file[13], cube_file[13];
+extern char episode_file[15], cube_file[15];
extern JE_longint episode1DataLoc;
extern JE_boolean bonusLevel;
diff --git a/src/lvllib.c b/src/lvllib.c
index a09c040..ca9a183 100644
--- a/src/lvllib.c
+++ b/src/lvllib.c
@@ -22,7 +22,7 @@
JE_LvlPosType lvlPos;
-char levelFile[13]; /* string [12] */
+char levelFile[30]; /* string [29] for gcc7's sake */
JE_word lvlNum;
void JE_analyzeLevel( void )
diff --git a/src/lvllib.h b/src/lvllib.h
index f22e3f5..61b3882 100644
--- a/src/lvllib.h
+++ b/src/lvllib.h
@@ -25,7 +25,7 @@
typedef JE_longint JE_LvlPosType[43]; /* [1..42 + 1] */
extern JE_LvlPosType lvlPos;
-extern char levelFile[13]; /* string [12] */
+extern char levelFile[30]; /* string [29] for gcc7's sake */
extern JE_word lvlNum;
void JE_analyzeLevel( void );
--
2.9.4

3
recipes-games/opentyrian/opentyrian_2.1.20130907.bb
View File

@@ -14,6 +14,7 @@ SRC_URI = " \
file://0001-Makefile-use-pkgconfig-to-find-sdl.patch \
file://0002-Fix-several-uninitialized-variable-warnings.patch \
file://0003-fix-build-with-pedantic-gcc6.patch \
file://0004-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch \
"
SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
@@ -21,6 +22,8 @@ SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008
SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
CFLAGS += "-Wimplicit-fallthrough=0"
do_install() {
install -d ${D}${bindir}
install ${BPN} ${D}${bindir}