This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit 409965fd72cc48658b65c153d6771e210db18909 Author: Jordi Mallach <[email protected]> Date: Tue Jul 5 10:59:50 2016 +0200 Attempt to fix alpha builds. Rename and extend mips64el patch to attempt to fix alpha's similar build failure. --- debian/changelog | 2 + .../remove-m64_flag_for_mips64el_alpha.patch | 59 ++++++++++++++++++++++ .../patches/removing-m64_flag_for_mips64el.patch | 33 ------------ debian/patches/series | 2 +- debian/rules | 5 -- 5 files changed, 62 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b2c72a..ecca207 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mame (0.175-1) UNRELEASED; urgency=medium * New upstream release. + * Rename and extend mips64el patch to attempt to fix alpha's similar + build failure. -- Jordi Mallach <[email protected]> Mon, 04 Jul 2016 16:52:51 +0200 diff --git a/debian/patches/remove-m64_flag_for_mips64el_alpha.patch b/debian/patches/remove-m64_flag_for_mips64el_alpha.patch new file mode 100644 index 0000000..146529b --- /dev/null +++ b/debian/patches/remove-m64_flag_for_mips64el_alpha.patch @@ -0,0 +1,59 @@ +Index: mame-0.175/makefile +=================================================================== +--- mame-0.175.orig/makefile ++++ mame-0.175/makefile +@@ -140,6 +140,12 @@ endif + ifneq ($(filter %86,$(UNAME_P)),) + PLATFORM := x86 + endif ++ifneq ($(filter alpha,$(UNAME_M)),) ++PLATFORM := alpha ++endif ++ifneq ($(filter alpha,$(UNAME_P)),) ++PLATFORM := alpha ++endif + ifneq ($(filter arm%,$(UNAME_M)),) + PLATFORM := arm + endif +@@ -155,6 +161,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.175/scripts/genie.lua +=================================================================== +--- mame-0.175.orig/scripts/genie.lua ++++ mame-0.175/scripts/genie.lua +@@ -982,6 +982,12 @@ end + end + end + ++if (_OPTIONS["PLATFORM"]=="alpha") then ++ defines { ++ "PTR64=1", ++ } ++end ++ + if (_OPTIONS["PLATFORM"]=="arm") then + buildoptions { + "-Wno-cast-align", +@@ -995,6 +1001,12 @@ if (_OPTIONS["PLATFORM"]=="arm64") then + defines { + "PTR64=1", + } ++end ++ ++if (_OPTIONS["PLATFORM"]=="mips64") then ++ defines { ++ "PTR64=1", ++ } + end + + local subdir diff --git a/debian/patches/removing-m64_flag_for_mips64el.patch b/debian/patches/removing-m64_flag_for_mips64el.patch deleted file mode 100644 index c19e54d..0000000 --- a/debian/patches/removing-m64_flag_for_mips64el.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 index 6b6ef20..2cb6de1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -removing-m64_flag_for_mips64el.patch +remove-m64_flag_for_mips64el_alpha.patch diff --git a/debian/rules b/debian/rules index 75ab4e9..ae11414 100755 --- a/debian/rules +++ b/debian/rules @@ -49,11 +49,6 @@ DEB_OPTS = \ # Override make variables for specific archs # Linux architectures -ifeq ($(DEB_HOST_ARCH),alpha) -DEB_OPTS += \ - PTR64=1 -endif - ifeq ($(DEB_HOST_ARCH),amd64) DEB_OPTS += \ FORCE_DRC_C_BACKEND= \ -- 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
