Date: Mon, 30 Nov 2015 02:21:43 +0000 From: Alexey Dokuchaev <danfe@FreeBSD.org> To: Michael Moll <mmoll@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r402631 - in head/x11-wm/blackbox: . files Message-ID: <20151130022143.GA73549@FreeBSD.org> In-Reply-To: <201511292153.tATLrDbl045927@repo.freebsd.org> References: <201511292153.tATLrDbl045927@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Nov 29, 2015 at 09:53:13PM +0000, Michael Moll wrote: > New Revision: 402631 > URL: https://svnweb.freebsd.org/changeset/ports/402631 > > Log: > x11-wm/blackbox: fix build on arm Can you explain what exactly was wrong and how this fix addresses the problem? > +.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" > +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_Toolbar.cc > +.endif Oh gosh this is so ugly. :( > +--- src/Toolbar.cc.orig 2015-05-11 11:54:54 UTC > ++++ src/Toolbar.cc > +@@ -44,7 +44,7 @@ long nextTimeout(int resolution) > + { > + timeval now; > + gettimeofday(&now, 0); > +- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l)) > ++ return (std::max(1000ll, ((((resolution - (now.tv_sec % resolution)) * 1000l)) Can we just make this code portable across the gang instead of having per-architecture EXTRA_PATCHES? ./danfe
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151130022143.GA73549>