Unbreak emulators/fs-uae build on sparc64

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Unbreak emulators/fs-uae build on sparc64

Kurt Mosiejczuk-9
This patch fixes the build for emulators/fs-uae for sparc64.

ok?

(cc maintainer)

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 26 Jul 2019 22:00:42 -0000 1.33
+++ Makefile 13 Feb 2020 04:55:00 -0000
@@ -7,7 +7,7 @@ V = 2.4.0
 MODPY_EGG_VERSION = ${V}
 DISTNAME = fs-uae-$V
 CATEGORIES = emulators
-REVISION = 10
+REVISION = 11
 
 HOMEPAGE = https://fs-uae.net/
 MAINTAINER = Edd Barrett <[hidden email]>
@@ -35,6 +35,10 @@ USE_GMAKE = Yes
 .include <bsd.port.arch.mk>
 .if ${PROPERTIES:Mclang}
 CXXFLAGS = -std=c++03
+.endif
+
+.if ${MACHINE} == "sparc64"
+CXXFLAGS += -fpermissive
 .endif
 
 MAKE_FLAGS += prefix=${PREFIX} CXXFLAGS="${CXXFLAGS}"

Reply | Threaded
Open this post in threaded view
|

Re: Unbreak emulators/fs-uae build on sparc64

Edd Barrett-3
Hi Kurt,

On Wed, Feb 12, 2020 at 11:56:14PM -0500, Kurt Mosiejczuk wrote:
> This patch fixes the build for emulators/fs-uae for sparc64.

I was recently playing with a newer version of fs-uae and found that the
typeof errors (I assume that's what you are seeing) could be fixed by
passing -std=gnu++03.

If that works for the in-tree version, would it be preferable to
-fpermissive?

P.S.

If anyone is interested in having a newer fs-uae, we need a Python 3
flavour of the wxWidgets bindings for fs-uae-launcher. I've not had time
to look into it.

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: Unbreak emulators/fs-uae build on sparc64

Kurt Mosiejczuk-9
On Thu, Feb 13, 2020 at 10:09:17AM +0000, Edd Barrett wrote:
> Hi Kurt,

> On Wed, Feb 12, 2020 at 11:56:14PM -0500, Kurt Mosiejczuk wrote:
> > This patch fixes the build for emulators/fs-uae for sparc64.

> I was recently playing with a newer version of fs-uae and found that the
> typeof errors (I assume that's what you are seeing) could be fixed by
> passing -std=gnu++03.

http://build-failures.rhaalovely.net/sparc64/2020-02-08/emulators/fs-uae.log

src/od-fs/picasso96.cpp: In function 'uae_u32 picasso_BlitRect(TrapContext*)':
src/od-fs/picasso96.cpp:3289:45: error: cast from 'std::nullptr_t' to 'uaecptr' {aka 'unsigned int'} loses precision [-fpermissive]
     result = BlitRect (renderinfo, (uaecptr)NULL, srcx, srcy, dstx, dsty, width, height, Mask, BLIT_SRC);

I was just taking the compilers advice to fix it. :)

So this is a cast that it didn't like.

> If that works for the in-tree version, would it be preferable to
> -fpermissive?

> P.S.

> If anyone is interested in having a newer fs-uae, we need a Python 3
> flavour of the wxWidgets bindings for fs-uae-launcher. I've not had time
> to look into it.

I'll take a look at it.

--Kurt