Date: Thu, 8 Apr 2021 11:41:10 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Piotr Kubaj <pkubaj@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: bc1f29459ae6 - 2021Q2 - games/libretro-mame2000: fix build on powerpc64* Message-ID: <20210408094110.eyjtp6wxhogjgqou@aching.in.mat.cc> In-Reply-To: <202104071646.137GkISZ014381@gitrepo.freebsd.org> References: <202104071646.137GkISZ014381@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--zrzkl7uht3nhgkwn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 07, 2021 at 04:46:18PM +0000, Piotr Kubaj wrote: > The branch 2021Q2 has been updated by pkubaj: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dbc1f29459ae6fe11ae6f590b= c91da9a90059b10b >=20 > commit bc1f29459ae6fe11ae6f590bc91da9a90059b10b > Author: Piotr Kubaj <pkubaj@FreeBSD.org> > AuthorDate: 2021-04-07 16:46:08 +0000 > Commit: Piotr Kubaj <pkubaj@FreeBSD.org> > CommitDate: 2021-04-07 16:46:08 +0000 >=20 > games/libretro-mame2000: fix build on powerpc64* > =20 > src/cpu/tms9900/99xxstat.h:204:14: error: expected identifier or '(' > static INT32 asm setst_add_32_laeco(register INT32 a, register INT32 = b, register INT16 st) When cherry-picking things to a branch, please use `git cherry-pick -x` to record the original hash in the commit. (There should be a check to prevent you from not doing it, but there is not right now.) > --- > games/libretro-mame2000/Makefile | 5 +++-- > .../libretro-mame2000/files/patch-src_cpu_tms9900_99xxstat.h | 11 +++++= ++++++ > 2 files changed, 14 insertions(+), 2 deletions(-) >=20 > diff --git a/games/libretro-mame2000/Makefile b/games/libretro-mame2000/M= akefile > index 75f9470d0416..76c5b9bdc43a 100644 > --- a/games/libretro-mame2000/Makefile > +++ b/games/libretro-mame2000/Makefile > @@ -1,5 +1,5 @@ > - > PORTNAME=3D libretro-mame2000 > + > PORTVERSION=3D 0.20210214 > CATEGORIES=3D games > =20 > @@ -8,7 +8,8 @@ COMMENT=3D MAME (0.37b5) for libretro > =20 > LICENSE=3D GPLv2 > =20 > -USES=3D compiler:c++11-lib gmake > +USES=3D compiler:c++11-lib dos2unix gmake > +DOS2UNIX_FILES=3D src/cpu/tms9900/99xxstat.h > USE_LDCONFIG=3D yes > =20 > USE_GITHUB=3D yes > diff --git a/games/libretro-mame2000/files/patch-src_cpu_tms9900_99xxstat= =2Eh b/games/libretro-mame2000/files/patch-src_cpu_tms9900_99xxstat.h > new file mode 100644 > index 000000000000..7d9b116b25e6 > --- /dev/null > +++ b/games/libretro-mame2000/files/patch-src_cpu_tms9900_99xxstat.h > @@ -0,0 +1,11 @@ > +--- src/cpu/tms9900/99xxstat.h.orig 2021-04-07 16:22:44 UTC > ++++ src/cpu/tms9900/99xxstat.h > +@@ -192,7 +192,7 @@ static INLINE void setst_c_lae(UINT16 to, UINT16 val) > + #define wadd(addr,expr) { int lval =3D setst_add_laeco(readword(addr), = (expr)); writeword((addr),lval); } > + #define wsub(addr,expr) { int lval =3D setst_sub_laeco(readword(addr), = (expr)); writeword((addr),lval); } > +=20 > +-#ifdef __POWERPC__ > ++#if defined(__POWERPC__) && !defined(__powerpc64__) > +=20 > + // setst_add_32_laeco : > + // - computes a+b >=20 --=20 Mathieu Arnold --zrzkl7uht3nhgkwn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmBuz7JfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgJN3RAAjqydLNwcF+ukE4YAxaamuYb/jxogqnypUZvlKZ+Z9qrlAsVUcvdYHhwc MHrA/jvlishpiXc7cYDtiSk+5Me0N7WPgzOZG6nrcFZVkONofZqOHWJeh06gTF/A of0psWa2GribvHBXWi6BaGJ49WDoWRsWkuqLM1zMJdqcMV6OMfkBNwAFSi9HQvLg dhVUAur78lTkY8HJlQr/WM7RTtiqZvl2oeXjeg0NPW7MwOFi4Md9M8EU6bi65YQG Wrbv7fy+NwzcMhLiMbWGD8CUjqIU0JC6NQTM3WBSvfxgEcVMwHMFPuhNlH+RAQNm kAuwqLqblSV/69qVi71PjHRato6kRc+6702BRwVCfoEKpTSucmYkSzvfG5+szJMA twSiFGprydsSm4OSn8Shve0gWhU36Ph1yhLTtyRUOJ8js8syZsFCWPaPzkf4JX7P hxjOzrL7h8mHPGiUhp6BnH4baKIqq4soQ2MrQPNTfEXH1SZTPze+g65G/6/qEAEQ kARGHzn/+wZH+3dIuxH3A5BTD1J/QsH0HRDI6n45xDbeCLS25RlwOYt3+VUcmpJI l+iyMfbSzsVrCgh9DFdKZfvxAZfdM+ygYJgzAj8euXJao2URW15Fy7af8pTDTEeV 9VpFZAWMEvHqdyqw7/zCf9dMZRviXXrNdUfEFLgc4R5huhj5cRA= =Yx1j -----END PGP SIGNATURE----- --zrzkl7uht3nhgkwn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210408094110.eyjtp6wxhogjgqou>