git: bc1f29459ae6 - 2021Q2 - games/libretro-mame2000: fix build on powerpc64*

[Mathieu Arnold]

On Wed, Apr 07, 2021 at 04:46:18PM +0000, Piotr Kubaj wrote:
> The branch 2021Q2 has been updated by pkubaj:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=bc1f29459ae6fe11ae6f590bc91da9a90059b10b
> 
> commit bc1f29459ae6fe11ae6f590bc91da9a90059b10b
> Author:     Piotr Kubaj <pkubaj at FreeBSD.org>
> AuthorDate: 2021-04-07 16:46:08 +0000
> Commit:     Piotr Kubaj <pkubaj at FreeBSD.org>
> CommitDate: 2021-04-07 16:46:08 +0000
> 
>     games/libretro-mame2000: fix build on powerpc64*
>     
>     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(-)
> 
> diff --git a/games/libretro-mame2000/Makefile b/games/libretro-mame2000/Makefile
> index 75f9470d0416..76c5b9bdc43a 100644
> --- a/games/libretro-mame2000/Makefile
> +++ b/games/libretro-mame2000/Makefile
> @@ -1,5 +1,5 @@
> -
>  PORTNAME=	libretro-mame2000
> +
>  PORTVERSION=	0.20210214
>  CATEGORIES=	games
>  
> @@ -8,7 +8,8 @@ COMMENT=	MAME (0.37b5) for libretro
>  
>  LICENSE=	GPLv2
>  
> -USES=		compiler:c++11-lib gmake
> +USES=		compiler:c++11-lib dos2unix gmake
> +DOS2UNIX_FILES=	src/cpu/tms9900/99xxstat.h
>  USE_LDCONFIG=	yes
>  
>  USE_GITHUB=	yes
> diff --git a/games/libretro-mame2000/files/patch-src_cpu_tms9900_99xxstat.h 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 = setst_add_laeco(readword(addr), (expr)); writeword((addr),lval); }
> + #define wsub(addr,expr) { int lval = setst_sub_laeco(readword(addr), (expr)); writeword((addr),lval); }
> + 
> +-#ifdef __POWERPC__
> ++#if defined(__POWERPC__) && !defined(__powerpc64__)
> + 
> + // setst_add_32_laeco :
> + // - computes a+b
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/attachments/20210408/6c350fe8/attachment.sig>