On Fri, Jan 01, 2021 at 02:53:19PM +0100, Charlene Wendling wrote: > Hi, > > > http://build-failures.rhaalovely.net/powerpc/2020-12-15/games/scummvm.log > > Classic relocation issue, i should have provided that fix earlier. > > With the below diff, scummvm builds on macppc [0]. I also successfully > tested the runtime playing Beneath a Steel Sky (games/bass). > > No REVISION bump is needed; this version has never been built on macppc, > and ${LDFLAGS} is empty on other archs. > > OK?
ok jsg@ > > Charlène. > > > [0] https://bin.charlenew.xyz/scummvm.log > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/games/scummvm/Makefile,v > retrieving revision 1.86 > diff -u -p -u -p -r1.86 Makefile > --- Makefile 3 Oct 2020 10:42:49 -0000 1.86 > +++ Makefile 1 Jan 2021 13:49:50 -0000 > @@ -40,6 +40,11 @@ LIB_DEPENDS= audio/fluidsynth \ > CXXFLAGS+= -mxgot > .endif > > +# Fix relocation overflows > +.if ${MACHINE_ARCH} == "powerpc" > +LDFLAGS+= -Wl,--relax > +.endif > + > CONFIGURE_STYLE=simple > CONFIGURE_ARGS+=--disable-alsa \ > --disable-cloud \ > @@ -55,7 +60,7 @@ CONFIGURE_ARGS+=--disable-alsa \ > --enable-sndio \ > --mandir="${LOCALBASE}/man" > CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ > - LDFLAGS="-L${LOCALBASE}/lib" > + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" > > NO_TEST= Yes > USE_GMAKE= Yes >
