mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-22 19:44:21 +01:00
games/mupen64plus: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
46ad2f0f4b
commit
1947fd014b
2 changed files with 14 additions and 0 deletions
11
games/mupen64plus/fix_multiple_definition_errors.patch
Normal file
11
games/mupen64plus/fix_multiple_definition_errors.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
diff -Naur mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h
|
||||||
|
--- mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h 2015-04-27 00:42:49.000000000 +0200
|
||||||
|
+++ mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h 2020-05-08 19:04:37.956818550 +0200
|
||||||
|
@@ -27,7 +27,6 @@
|
||||||
|
|
||||||
|
struct work_struct;
|
||||||
|
|
||||||
|
-struct work_struct *work;
|
||||||
|
typedef void (*work_func_t)(struct work_struct *work);
|
||||||
|
struct work_struct {
|
||||||
|
work_func_t func;
|
|
@ -51,6 +51,9 @@ find -L . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||||
|
|
||||||
|
# https://github.com/mupen64plus/mupen64plus-core/issues/712#issuecomment-588871449
|
||||||
|
patch -p1 < $CWD/fix_multiple_definition_errors.patch
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./m64p_build.sh V=1
|
./m64p_build.sh V=1
|
||||||
|
|
Loading…
Reference in a new issue