- Fix build with clang New file: files/patch-hdr__registers.h
State Changed From-To: open->feedback build fails, http://pkgdev.miwibox.org/latest-per-pkg/generator-cbiere/0.35.r4_4,1/
Here is the corrected patch.
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
Remake of the patch against current tree.
State Changed From-To: feedback->closed Committed. Thanks!
Author: miwi Date: Fri Feb 7 15:55:44 2014 New Revision: 343272 URL: http://svnweb.freebsd.org/changeset/ports/343272 QAT: https://qat.redports.org/buildarchive/r343272/ Log: - Stage support - Fix build PR: 185518 Submitted by: Ports Fury Added: head/emulators/generator-cbiere/files/patch-hdr__registers.h (contents, props changed) head/emulators/generator-cbiere/files/patch-main__reg68k.c (contents, props changed) Modified: head/emulators/generator-cbiere/Makefile Modified: head/emulators/generator-cbiere/Makefile ============================================================================== --- head/emulators/generator-cbiere/Makefile Fri Feb 7 15:54:38 2014 (r343271) +++ head/emulators/generator-cbiere/Makefile Fri Feb 7 15:55:44 2014 (r343272) @@ -15,48 +15,40 @@ COMMENT= SEGA Genesis emulator 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 -USES= gmake 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 + +OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL +OPTIONS_DEFINE_i386= RAZE -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} +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 .include <bsd.port.options.mk> -.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS) -CONFIGURE_ARGS+= --without-gcc -.endif - -.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 + @${REINPLACE_CMD} -e \ + '/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in .include <bsd.port.mk> Added: head/emulators/generator-cbiere/files/patch-hdr__registers.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/generator-cbiere/files/patch-hdr__registers.h Fri Feb 7 15:55:44 2014 (r343272) @@ -0,0 +1,23 @@ +--- hdr/registers.h.orig ++++ hdr/registers.h +@@ -6,17 +6,17 @@ + call a C function, then when that C function returns these registers are + still what they were before we made the call. */ + +-#ifdef PROCESSOR_ARM ++#if defined(PROCESSOR_ARM) && !defined(__clang__) + register uint32 reg68k_pc asm ("r7"); + register uint32 *reg68k_regs asm ("r8"); + register t_sr reg68k_sr asm ("r9"); + #else +-# ifdef PROCESSOR_SPARC ++# if defined(PROCESSOR_SPARC) && !defined(__clang__) + register uint32 reg68k_pc asm ("5"); + register uint32 *reg68k_regs asm ("6"); + register t_sr reg68k_sr asm ("7"); + # else +-# ifdef PROCESSOR_INTEL ++# if defined(PROCESSOR_INTEL) && !defined(__clang__) + register uint32 reg68k_pc asm ("%ebx"); + register uint32 *reg68k_regs asm ("%edi"); + register t_sr reg68k_sr asm ("%esi"); Added: head/emulators/generator-cbiere/files/patch-main__reg68k.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/generator-cbiere/files/patch-main__reg68k.c Fri Feb 7 15:55:44 2014 (r343272) @@ -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; _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"