pool/0ad
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 964369 from home:bmwiedemann:branches:games

Browse Source 
Drop fix-i586-build.patch after boo#1197065 was fixed

OBS-URL: https://build.opensuse.org/request/show/964369
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=120
This commit is contained in:
Dirk Stoecker 2022-03-29 08:03:09 +00:00 committed by Git OBS Bridge
parent d043fd1f1e
commit a18475e9cb
3 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
0ad.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 23 19:03:43 UTC 2022 - Bernhard Wiedemann <bwiedemann@suse.com>
- Drop fix-i586-build.patch after boo#1197065 was fixed
-------------------------------------------------------------------
Sun Mar 13 11:57:58 UTC 2022 - Bernhard Wiedemann <bwiedemann@suse.com>

4
0ad.spec
View File

@ -46,7 +46,6 @@ Patch1: no-version-check.patch
Patch2: PrepareZoneForGC.patch
# PATCH-FIX-UPSTREAM -- Don't define M_PIf if glibc already provides it
Patch3: glibc-2.35.patch
Patch4: fix-i586-build.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libXcursor-devel
@ -101,9 +100,6 @@ flexible game engine.
%patch1 -p1
%patch2 -p1
%endif
%ifarch %{ix86}
%patch4 -p1
%endif
%build
export CFLAGS="%{optflags}"

40
fix-i586-build.patch
View File

@ -1,40 +0,0 @@
Date: 2022-03-13
Author: Bernhard M. Wiedemann <bwiedemann suse.de>
fix/workaround i586 build
https://bugzilla.opensuse.org/show_bug.cgi?id=1197065
It was segfaulting in premake5 because of a problem with gcc11 and the premake5 source
(gdb) bt
#0 0x5666a68b in ?? ()
#1 0x565713e5 in luaL_requiref ()
#2 0x5658e67f in luaL_openlibs ()
#3 0x5656edc7 in main ()
diff --git a/build/premake/premake5/contrib/lua/src/lapi.c b/build/premake/premake5/contrib/lua/src/lapi.c
index 02b7fab..cd4e176 100644
--- a/build/premake/premake5/contrib/lua/src/lapi.c
+++ b/build/premake/premake5/contrib/lua/src/lapi.c
@@ -204,7 +204,7 @@ static void reverse (lua_State *L, StkId from, StkId to) {
** Let x = AB, where A is a prefix of length 'n'. Then,
** rotate x n == BA. But BA == (A^r . B^r)^r.
*/
-LUA_API void lua_rotate (lua_State *L, int idx, int n) {
+LUA_API __attribute__((noipa)) void lua_rotate (lua_State *L, int idx, int n) {
StkId p, t, m;
lua_lock(L);
t = L->top - 1; /* end of stack segment being rotated */
diff --git a/build/premake/premake5/contrib/lua/src/lua.h b/build/premake/premake5/contrib/lua/src/lua.h
index c236e36..7d4aebb 100644
--- a/build/premake/premake5/contrib/lua/src/lua.h
+++ b/build/premake/premake5/contrib/lua/src/lua.h
@@ -159,7 +159,7 @@ LUA_API int (lua_absindex) (lua_State *L, int idx);
LUA_API int (lua_gettop) (lua_State *L);
LUA_API void (lua_settop) (lua_State *L, int idx);
LUA_API void (lua_pushvalue) (lua_State *L, int idx);
-LUA_API void (lua_rotate) (lua_State *L, int idx, int n);
+LUA_API __attribute__((noipa)) void (lua_rotate) (lua_State *L, int idx, int n);
LUA_API void (lua_copy) (lua_State *L, int fromidx, int toidx);
LUA_API int (lua_checkstack) (lua_State *L, int n);