The package rpms/mame.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mame.git/commit/?id=27528e30c8544782....
Change: +%ifarch %{arm}
Thanks.
Full change: ============
commit 27528e30c8544782695226bc4f115255a6c926e6 Author: Julian Sikorski belegdol@fedoraproject.org Date: Tue Sep 11 08:00:20 2018 +0200
Update to 0.201 Drop upstreamed imgtool patch Add ExcludeArch: %{arm} due to issues with linker running out of memory Apply -g1 across the board to prevent relocation overflows
diff --git a/.gitignore b/.gitignore index 7d45f67..d779146 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ /whatsnew_0199.txt /mame0200s.exe /whatsnew_0200.txt +/mame0201s.exe +/whatsnew_0201.txt diff --git a/0001-imgtool-fix-parsing-options-with-enum-values.patch b/0001-imgtool-fix-parsing-options-with-enum-values.patch deleted file mode 100644 index b1e6c83..0000000 --- a/0001-imgtool-fix-parsing-options-with-enum-values.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0d8ca95a1b5942b0c56744edfed3f74515418750 Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet fabrice@bellet.info -Date: Wed, 27 Jun 2018 08:15:39 +0200 -Subject: [PATCH] imgtool: fix parsing options with enum values - -When parsing an enumerated option, we should use the parameter of the -enumerated value, as an integer, instead of the raw identifier as a -string. The behaviour probably changed around commit b60879e595, but -modules still expect the old behaviour. ---- - src/tools/imgtool/main.cpp | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/tools/imgtool/main.cpp b/src/tools/imgtool/main.cpp -index 50c65845dd..5c55535932 100644 ---- a/src/tools/imgtool/main.cpp -+++ b/src/tools/imgtool/main.cpp -@@ -106,7 +106,23 @@ static int parse_options(int argc, char *argv[], int minunnamed, int maxunnamed, - if (i < minunnamed) - goto error; /* Too few unnamed */ - -- resolution->find(name)->set_value(value); -+ util::option_resolution::entry *entry = resolution->find(name); -+ if (entry->option_type() == util::option_guide::entry::option_type::ENUM_BEGIN) -+ { -+ const util::option_guide::entry *enum_value; -+ for (enum_value = entry->enum_value_begin(); enum_value != entry->enum_value_end(); enum_value++) -+ { -+ if (!strcmp (enum_value->identifier(), value)) -+ { -+ entry->set_value(enum_value->parameter()); -+ break; -+ } -+ } -+ if (enum_value == entry->enum_value_end()) -+ goto error; -+ } -+ else -+ entry->set_value(value); - } - } - } --- -2.17.1 - diff --git a/mame.spec b/mame.spec index a9a246c..bd5c8b8 100644 --- a/mame.spec +++ b/mame.spec @@ -1,7 +1,7 @@ #The debug build is disabled by default, please use # --with debug to override %bcond_with debug
-%global baseversion 200 +%global baseversion 201
Name: mame Version: 0.%{baseversion} @@ -22,11 +22,12 @@ Source0: https://github.com/mamedev/%%7Bname%7D/releases/download/%%7Bname%7D0%%7Bb Source1: http://mamedev.org/releases/whatsnew_0%%7Bbaseversion%7D.txt Patch0: %{name}-fortify.patch Patch1: %{name}-genie-systemlua.patch -Patch2: 0001-imgtool-fix-parsing-options-with-enum-values.patch +# %%{arm}: +# https://bugzilla.redhat.com/show_bug.cgi?id=1627625 # %%{power64}: # https://github.com/mamedev/mame/issues/3157 # https://bugzilla.redhat.com/show_bug.cgi?id=1541613 -ExcludeArch: %{power64} +ExcludeArch: %{arm} %{power64}
#asio in Fedora repositories is too old (1.11.x is needed) #BuildRequires: asio-devel @@ -153,7 +154,6 @@ find ( -regex '.*.(c|cpp|fsh|fx|h|hpp|lua|make|map|md|txt|vsh|xml
%patch0 -p1 -b .fortify %patch1 -p1 -b .systemlua -%patch2 -p1 -b .imgtool-options
# Create ini files cat > %{name}.ini << EOF @@ -217,13 +217,16 @@ MAME_FLAGS="NOWERROR=1 OPTIMIZE=2 PYTHON_EXECUTABLE=python3 VERBOSE=1 \ USE_SYSTEM_LIB_ZLIB=1 \ SDL_INI_PATH=%{_sysconfdir}/%{name};"
-#standard -g causes builder to run out of memory -%ifarch %{arm} %{ix86} riscv64 s390x +#standard -g caused problems with OOM or relocation overflows RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-g@-g1@") -#%%arm needs even more measures -%ifarch %{arm} +#32-bit architectures need even more measures +%ifarch %{ix86} RPM_LD_FLAGS="$RPM_LD_FLAGS -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif +%ifarch %{arm} +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-O2@-Os@") +RPM_LD_FLAGS="$RPM_LD_FLAGS -Wl,--no-keep-memory -fuse-ld=gold" +MAME_FLAGS=$(echo $MAME_FLAGS | sed "s@OPTIMIZE=2@OPTIMIZE=s@") %endif
%if %{with debug} @@ -354,6 +357,12 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name} -name LICENSE -exec rm {} ;
%changelog +* Thu Aug 30 2018 Julian Sikorski belegdol@fedoraproject.org - 0.201-1 +- Update to 0.201 +- Drop upstreamed imgtool patch +- Add ExcludeArch: %%{arm} due to issues with linker running out of memory +- Apply -g1 across the board to prevent relocation overflows + * Wed Jul 25 2018 Julian Sikorski belegdol@fedoraproject.org - 0.200-1 - Updated to 0.200 - Re-enabled %%{arm} build diff --git a/sources b/sources index 7853972..fbedf50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mame0200s.exe) = ca5c8025180b77fd15f8c81d1a2a34aa61a19bec7a4de408c646d75451831b401cec4d2423c8bab69f45709a045ff0f6de6613bebf375d8ac20438f8fdab69bc -SHA512 (whatsnew_0200.txt) = 0e5134e5245969cf7d53ac9ad8577988f9cc09d322e8229c0b824db29d37fd1d69e949b7fd0848c39aceb65e4cc9e39d97e7b0aa176693b5bebfe7995d2453f1 +SHA512 (mame0201s.exe) = 17dc58068f91ac3585d45ac59d5ed58a2d7b406e087ae85959b5b828dd4af6906b0f1b25eca9ae177c65100edf00692fb1d4ac97fe95b7a772dd15a201aca6fc +SHA512 (whatsnew_0201.txt) = 953079f242f407be86117229a205c75ea7a998e8d8a6698bd9514b64b13e050480126567c8903fca8a8c9238f158222f292ad77fcefa9aac73c25e701b5d45d7