This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit 8589b03632d04bb914880d6769c76aa21bf373b8 Author: Jordi Mallach <[email protected]> Date: Fri Nov 4 11:12:31 2016 +0100 Further changes for the arm64 -fPIC fix. Quote ARCHOPTS to unconfuse make. Add m68000_archopts.patch: Add $(ARCHOPTS) to compiler invocation in the standalone m68000 makefile. --- debian/changelog | 4 +++- debian/patches/m68000_archopts.patch | 17 +++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4f6ee8..fb19ca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mame (0.179-2) UNRELEASED; urgency=medium - * Pass -fPIC to arm64 build to workaround yet another build issue. + * Add -fPIC to arm64 ARCHOPTS to workaround yet another build issue. + * Add m68000_archopts.patch: Add $(ARCHOPTS) to compiler invocation in the + standalone m68000 makefile. -- Jordi Mallach <[email protected]> Wed, 02 Nov 2016 11:56:14 +0100 diff --git a/debian/patches/m68000_archopts.patch b/debian/patches/m68000_archopts.patch new file mode 100644 index 0000000..61e7965 --- /dev/null +++ b/debian/patches/m68000_archopts.patch @@ -0,0 +1,17 @@ +Author: Jordi Mallach <[email protected]> +Description: Pass $(ARCHOPTS) to standalone m68000 makefile. +Forwarded: no + +Index: mame-0.179/src/devices/cpu/m68000/makefile +=================================================================== +--- mame-0.179.orig/src/devices/cpu/m68000/makefile ++++ mame-0.179/src/devices/cpu/m68000/makefile +@@ -25,7 +25,7 @@ clean: + -@rm -f m68kops.* + + m68kmake.o: m68kmake.cpp +- $(SILENT) $(CC) -x c++ -std=c++11 -o "$@" -c "$<" ++ $(SILENT) $(CC) -x c++ -std=c++11 $(ARCHOPTS) -o "$@" -c "$<" + + m68kmake$(EXE) : m68kmake.o + @echo Linking $@... diff --git a/debian/patches/series b/debian/patches/series index bd2ccae..ec02444 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ genie_freebsd_target.patch hurd.patch sphinx_mathjax_location.patch +m68000_archopts.patch diff --git a/debian/rules b/debian/rules index 72d4506..5add4e1 100755 --- a/debian/rules +++ b/debian/rules @@ -61,7 +61,7 @@ endif ifeq ($(DEB_HOST_ARCH),arm64) DEB_OPTS += \ - ARCHOPTS=-mabi=lp64 -fPIC\ + ARCHOPTS="-mabi=lp64 -fPIC" \ OVERRIDE_CXX=g++-5 \ OVERRIDE_CC=gcc-5 \ CC=gcc-5 -- 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
