diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /games-puzzle/neverball/files | |
parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) |
gentoo resync : 05.02.2020
Diffstat (limited to 'games-puzzle/neverball/files')
-rw-r--r-- | games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch b/games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch new file mode 100644 index 000000000000..54bd211080c6 --- /dev/null +++ b/games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch @@ -0,0 +1,42 @@ +From a42492b8db06934c7a794630db92e3ff6ebaadaa Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Mon, 3 Feb 2020 20:25:57 +0000 +Subject: [PATCH] share/text.h: fix build failure against gcc-10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +cc .. -o neverball ... +ld: ball/st_save.o:(.bss+0x0): + multiple definition of `text_input'; share/text.o:(.bss+0x0): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/708050 +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + share/text.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/share/text.h ++++ b/share/text.h +@@ -15,7 +15,7 @@ int text_length(const char *); + + /*---------------------------------------------------------------------------*/ + +-char text_input[MAXSTR]; ++extern char text_input[MAXSTR]; + + void text_input_start(void (*cb)(int typing)); + void text_input_stop(void); +-- +2.25.0 + |