Date: Wed, 1 Jul 2015 19:54:57 +0000 (UTC) From: Johan van Selst <johans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391118 - head/games/crafty Message-ID: <201507011954.t61Jsv8l025974@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johans Date: Wed Jul 1 19:54:56 2015 New Revision: 391118 URL: https://svnweb.freebsd.org/changeset/ports/391118 Log: - Fix build for several architectures. Set CPUS=1 on non-x86. This leads to disabling custom thread synchronization primitives coded in x86 assembly and thus allows build (confirmed successful builds on mips and armv6, however haven't tested whether it actually works). - Minor cleanups added to pet portlint PR: 201255 Submitted by: amdmi3 Modified: head/games/crafty/Makefile head/games/crafty/pkg-plist Modified: head/games/crafty/Makefile ============================================================================== --- head/games/crafty/Makefile Wed Jul 1 19:36:54 2015 (r391117) +++ head/games/crafty/Makefile Wed Jul 1 19:54:56 2015 (r391118) @@ -31,7 +31,7 @@ WITH_RCDIR?= ~/ WITH_TBDIR?= ${PREFIX}/lib/crafty/TB WITH_PERSDIR?= ${PREFIX}/lib/crafty/cpf -OPT= -DCPUS=4 -DHASHSTATS -DTRACE -DBOOKDIR=\\\"${WITH_BOOKDIR}\\\" \ +OPT= -DHASHSTATS -DTRACE -DBOOKDIR=\\\"${WITH_BOOKDIR}\\\" \ -DLOGDIR=\\\"${WITH_LOGDIR}\\\" \ -DRCDIR=\\\"${WITH_RCDIR}\\\" \ -DTBDIR=\\\"${WITH_TBDIR}\\\" \ @@ -42,22 +42,17 @@ OPTIONS_DEFAULT=DOCS OPTIONS_SUB= yes BOOK_DESC= Include (default) opening book -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" -# The i386 assembly is currently broken - disable for this version -#OPT+= -DINLINE32 -.elif ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} DOCFILES= crafty.doc.ascii crafty.doc.ps DISTFILES+= ${DOCFILES:S/$/:doc/} UTILS= bitmaps.tgz sound.zip DISTFILES+= ${UTILS:S/$/:utils/} + +.include <bsd.port.pre.mk> + +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +OPT+= -DCPUS=4 +.else +OPT+= -DCPUS=1 # disables x86 assembler .endif .if ${PORT_OPTIONS:MBOOK} @@ -85,10 +80,8 @@ do-install: .endif ${INSTALL_DATA} ${WRKSRC}/books.bin ${WRKSRC}/crafty.hlp \ ${STAGEDIR}${PREFIX}/lib/crafty -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${DOCFILES} ${UTILS} \ ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.post.mk> Modified: head/games/crafty/pkg-plist ============================================================================== --- head/games/crafty/pkg-plist Wed Jul 1 19:36:54 2015 (r391117) +++ head/games/crafty/pkg-plist Wed Jul 1 19:54:56 2015 (r391118) @@ -12,10 +12,9 @@ lib/crafty/crafty.hlp %%PORTDOCS%%%%DOCSDIR%%/crafty.doc.ps %%PORTDOCS%%%%DOCSDIR%%/bitmaps.tgz %%PORTDOCS%%%%DOCSDIR%%/sound.zip -%%PORTDOCS%%@dirrm %%DOCSDIR%% @mode 775 @group nogroup -@dirrm lib/crafty/cpf -@dirrm lib/crafty +@dir lib/crafty/cpf +@dir lib/crafty @mode @group wheel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507011954.t61Jsv8l025974>