Date: Tue, 2 Oct 2007 17:52:19 +0200 (CEST) From: Martin Wilke <miwi@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: edwin@mavetju.org Subject: ports/116832: [PATCH] games/einstein: Fix build with AMD64/GCC4.2 Message-ID: <20071002155219.746322E114@miwi.homeunix.com> Resent-Message-ID: <200710021600.l92G08nn080469@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116832 >Category: ports >Synopsis: [PATCH] games/einstein: Fix build with AMD64/GCC4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 02 16:00:08 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Wilke >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD miwi.homeunix.com 7.0-CURRENT FreeBSD 7.0-CURRENT #305: Fri Sep 28 12:07:59 CEST 2007 >Description: - Unbreak - Fix build with AMD64 and GCC4.2 Tindy tested: i386 http://head.miwibox.org/tb/index.php?action=describe_port&id=2162 amd64 http://amd64.miwibox.org/tb/index.php?action=describe_port&id=1603 Added file(s): - files/patch-formatter.cpp Port maintainer (edwin@mavetju.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- einstein-2.0_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/games/einstein/Makefile,v retrieving revision 1.8 diff -u -u -r1.8 Makefile --- Makefile 2 Oct 2007 10:37:26 -0000 1.8 +++ Makefile 2 Oct 2007 14:08:46 -0000 @@ -18,15 +18,7 @@ USE_SDL= sdl ttf mixer WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" -BROKEN= Does not compile with GCC 4.2 -.endif -.endif - post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: files/patch-formatter.cpp =================================================================== RCS file: files/patch-formatter.cpp diff -N files/patch-formatter.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-formatter.cpp 2 Oct 2007 15:30:55 -0000 @@ -0,0 +1,31 @@ +diff -urN einstein-2.0.orig/formatter.cpp einstein-2.0/formatter.cpp +--- formatter.cpp 2005-08-13 22:40:58.000000000 -0400 ++++ formatter.cpp 2006-08-15 11:18:28.000000000 -0400 +@@ -58,7 +58,7 @@ + if ((c.type == INT_ARG) || (c.type == STRING_ARG) || + (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG)) + { +- int no = (int)c.data; ++ long int no = (long int)c.data; + args[no - 1] = c.type; + } + } +@@ -123,7 +123,7 @@ + std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const + { + std::wstring s; +- int no; ++ long int no; + + for (int i = 0; i < commandsCnt; i++) { + Command *cmd = &commands[i]; +@@ -135,8 +135,8 @@ + + case STRING_ARG: + case INT_ARG: +- no = (int)cmd->data - 1; +- if (no < (int)argValues.size()) ++ no = (long int)cmd->data - 1; ++ if (no < (long int)argValues.size()) + s += argValues[no]->format(cmd); + break; --- einstein-2.0_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071002155219.746322E114>