Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Apr 2014 00:48:52 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r351742 - branches/2014Q2/games/quantumminigolf
Message-ID:  <201404220048.s3M0mq2L024754@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Apr 22 00:48:52 2014
New Revision: 351742
URL: http://svnweb.freebsd.org/changeset/ports/351742
QAT: https://qat.redports.org/buildarchive/r351742/

Log:
  MFH: r350088
  
  - Fix build on HEAD (unknown clang option -malign-double)
  
  Approved by:	portmgr

Modified:
  branches/2014Q2/games/quantumminigolf/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/games/quantumminigolf/Makefile
==============================================================================
--- branches/2014Q2/games/quantumminigolf/Makefile	Tue Apr 22 00:47:40 2014	(r351741)
+++ branches/2014Q2/games/quantumminigolf/Makefile	Tue Apr 22 00:48:52 2014	(r351742)
@@ -14,7 +14,7 @@ COMMENT=	A computer game visualizing qua
 LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libfftw3.so:${PORTSDIR}/math/fftw3
 
-USES=		gmake
+USES=		gmake compiler:env
 USE_SDL=	sdl ttf
 
 PLIST_FILES=	bin/${PORTNAME}
@@ -31,11 +31,11 @@ DESKTOP_ENTRIES="Quantum Minigolf" \
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CXXFLAGS+=	-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops
-.	if ${ARCH} == "i386"
+.	if ${ARCH} == "i386" && ${COMPILER_TYPE} != "clang"
 CXXFLAGS+=	-malign-double
 .	endif
 .endif
@@ -54,12 +54,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${STAGEDIR}${DATADIR}/fonts
 	${INSTALL_DATA} ${WRKSRC}/tracks/*.bmp ${WRKSRC}/tracks/*.cfg \
 		${STAGEDIR}${DATADIR}/tracks
-
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404220048.s3M0mq2L024754>