ports/185518: emulators/generator-cbiere: Fix build with clang

[KATO Tsuguru]

The following reply was made to PR ports/185518; it has been noted by GNATS.

From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/185518: emulators/generator-cbiere: Fix build with clang
Date: Tue, 21 Jan 2014 02:58:07 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Tue__21_Jan_2014_02_58_07_+0900_e0AoQmPRukg2LtA6
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Here is the corrected patch.
 
 --Multipart=_Tue__21_Jan_2014_02_58_07_+0900_e0AoQmPRukg2LtA6
 Content-Type: text/x-diff;
  name="emulators_generator-cbiere.diff"
 Content-Disposition: attachment;
  filename="emulators_generator-cbiere.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/generator-cbiere/Makefile emulators/generator-cbiere/Makefile
 --- /usr/ports/emulators/generator-cbiere/Makefile	2013-11-06 22:06:26.000000000 +0900
 +++ emulators/generator-cbiere/Makefile	2014-01-21 00:00:00.000000000 +0900
 @@ -15,54 +15,40 @@
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 -
 -OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL
 -OPTIONS_DEFINE_i386=	RAZE
 -RAZE_DESC=	Use RAZE z80 emulation (only for i386)
 -SDL_DESC=	Use SDL for audio
 +LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
  
  USE_BZIP2=	yes
 +USES=		gmake
  USE_GNOME=	gtk12
  USE_SDL=	sdl
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
 -CONFIGURE_ARGS+=--with-gtk
 +CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \
 +		--with-gtk
  MAKE_JOBS_UNSAFE=	yes
  
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}-gtk
 +PLIST_FILES=	bin/${UNIQUENAME}-gtk
  
 -LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 +OPTIONS_DEFINE=		OPTIMIZED_CFLAGS SDL
 +OPTIONS_DEFINE_i386=	RAZE
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 +OPTIMIZED_CFLAGS_CONFIGURE_OFF=	--without-gcc
 +RAZE_DESC=		Use RAZE z80 emulation
 +RAZE_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 +RAZE_CONFIGURE_ON=	--with-raze
 +SDL_DESC=		Use SDL for audio
 +SDL_CONFIGURE_ON=	--with-sdl-audio
  
 -.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 -CONFIGURE_ARGS+=	--without-gcc
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MRAZE}
 -BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 -CONFIGURE_ARGS+=--with-raze
 -.else
 +.if empty(PORT_OPTIONS:MRAZE)
  CONFIGURE_ARGS+=--with-cmz80
  .endif
  
 -.if ${PORT_OPTIONS:MSDL}
 -CONFIGURE_ARGS+=--with-sdl-audio
 -.endif
 -
  post-patch:
 -	@${REINPLACE_CMD} -e '/%define %1 @UNDERSCORE@%1 /d' \
 -		${WRKSRC}/raze/raze.asm.in
 -
 -post-install:
 -	@${ECHO_CMD}
 -	@${CAT} ${PKGMESSAGE}
 -	@${ECHO_CMD}
 +	@${REINPLACE_CMD} -e \
 +		'/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/emulators/generator-cbiere/files/patch-hdr__registers.h emulators/generator-cbiere/files/patch-hdr__registers.h
 --- /usr/ports/emulators/generator-cbiere/files/patch-hdr__registers.h	1970-01-01 09:00:00.000000000 +0900
 +++ emulators/generator-cbiere/files/patch-hdr__registers.h	2014-01-21 00:00:00.000000000 +0900
 @@ -0,0 +1,26 @@
 +--- hdr/registers.h.orig
 ++++ hdr/registers.h
 +@@ -6,6 +6,7 @@
 +    call a C function, then when that C function returns these registers are
 +    still what they were before we made the call. */
 + 
 ++#if defined(__GNUC__) && !defined(__clang__)
 + #ifdef PROCESSOR_ARM
 +      register uint32 reg68k_pc asm ("r7");
 +      register uint32 *reg68k_regs asm ("r8");
 +@@ -20,12 +21,13 @@
 +          register uint32 reg68k_pc asm ("%ebx");
 +          register uint32 *reg68k_regs asm ("%edi");
 +          register t_sr reg68k_sr asm ("%esi");
 ++#    endif
 ++#  endif
 ++#endif
 + #    else
 +          extern uint32 reg68k_pc;
 +          extern uint32 *reg68k_regs;
 +          extern t_sr reg68k_sr;
 +-#    endif
 +-#  endif
 + #endif
 + 
 + #endif /* REGISTERS_HEADER_FILE */
 diff -urN /usr/ports/emulators/generator-cbiere/files/patch-main__reg68k.c emulators/generator-cbiere/files/patch-main__reg68k.c
 --- /usr/ports/emulators/generator-cbiere/files/patch-main__reg68k.c	1970-01-01 09:00:00.000000000 +0900
 +++ emulators/generator-cbiere/files/patch-main__reg68k.c	2014-01-21 00:00:00.000000000 +0900
 @@ -0,0 +1,13 @@
 +--- main/reg68k.c.orig
 ++++ main/reg68k.c
 +@@ -18,8 +18,8 @@
 + 
 + /*** global variables ***/
 + 
 +-#if (!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
 +-       || defined(PROCESSOR_INTEL)))
 ++#if ((!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
 ++       || defined(PROCESSOR_INTEL))) || defined(__clang__))
 + uint32 reg68k_pc;
 + uint32 *reg68k_regs;
 + t_sr reg68k_sr;
 
 --Multipart=_Tue__21_Jan_2014_02_58_07_+0900_e0AoQmPRukg2LtA6--