This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit 4e9417244e02d6b786a3a6fe0bc40b51d723e3f2 Author: Jordi Mallach <[email protected]> Date: Mon Jul 4 16:00:44 2016 +0200 Fix build on mips64el. Avoid using -m64 with GCC and unset PTR64 in debian/rules. Refresh patch for 0.174. --- debian/changelog | 5 ++++ .../patches/removing-m64_flag_for_mips64el.patch | 33 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 6 ---- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c13bdd..93fddd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ mame (0.174-1) UNRELEASED; urgency=medium - reduce memory required by ld on all archs (Ubuntu) - remove -g gcc switch when no DEBUG required + [ Jordi Mallach ] + * debian/rules: don't set PTR64 on mips64el. + * Add removing-m64_flag_for_mips64el.patch: avoid using -m64 on mips64el + to fix a FTBFS. Thanks to Daniel Knezevic for the patch (closes: #827798). + -- Cesare Falco <[email protected]> Sat, 04 Jun 2016 09:16:26 +0200 mame (0.173-6) unstable; urgency=medium diff --git a/debian/patches/removing-m64_flag_for_mips64el.patch b/debian/patches/removing-m64_flag_for_mips64el.patch new file mode 100644 index 0000000..c19e54d --- /dev/null +++ b/debian/patches/removing-m64_flag_for_mips64el.patch @@ -0,0 +1,33 @@ +Index: mame-0.174/makefile +=================================================================== +--- mame-0.174.orig/makefile ++++ mame-0.174/makefile +@@ -150,6 +150,11 @@ endif + ifneq ($(filter powerpc,$(UNAME_P)),) + PLATFORM := powerpc + endif ++ifneq ($(filter mips64%,$(UNAME_M)),) ++ifeq ($(shell getconf LONG_BIT),64) ++PLATFORM := mips64 ++endif ++endif + ifeq ($(firstword $(filter Linux,$(UNAME))),Linux) + OS := linux + endif +Index: mame-0.174/scripts/genie.lua +=================================================================== +--- mame-0.174.orig/scripts/genie.lua ++++ mame-0.174/scripts/genie.lua +@@ -1006,6 +1006,12 @@ if (_OPTIONS["PLATFORM"]=="arm64") then + } + end + ++if (_OPTIONS["PLATFORM"]=="mips64") then ++ defines { ++ "PTR64=1", ++ } ++end ++ + local subdir + if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then + subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6b6ef20 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +removing-m64_flag_for_mips64el.patch diff --git a/debian/rules b/debian/rules index 7dc3b35..75ab4e9 100755 --- a/debian/rules +++ b/debian/rules @@ -88,12 +88,6 @@ DEB_OPTS += \ ARCHOPTS=-Umips endif -ifeq ($(DEB_HOST_ARCH),mips64el) -DEB_OPTS += \ - PTR64=1 \ - NOASM= -endif - ifeq ($(DEB_HOST_ARCH),powerpc) DEB_OPTS += \ ARCHOPTS=-Upowerpc \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
