Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Apr 2019 17:42:28 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r497859 - in branches/2019Q2/games: billardgl brainparty einstein kobodeluxe nxengine pouetchess powder scourge
Message-ID:  <201904041742.x34HgS0S045088@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Thu Apr  4 17:42:27 2019
New Revision: 497859
URL: https://svnweb.freebsd.org/changeset/ports/497859

Log:
  MFH: r497858
  
  Conditionalize compiler flags that are specific to clang to fix errors
  of the following forms on GCC-based architectures:
  
    cc1plus: error: unrecognized command line option "-Wno-c++11-narrowing"
    cc1plus: error: unrecognized command line option "-Wno-reserved-user-defined-literal"
    cc1plus: warning: unrecognized command line option '-Wno-error-narrowing'
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  branches/2019Q2/games/billardgl/Makefile
  branches/2019Q2/games/brainparty/Makefile
  branches/2019Q2/games/einstein/Makefile
  branches/2019Q2/games/kobodeluxe/Makefile
  branches/2019Q2/games/nxengine/Makefile
  branches/2019Q2/games/pouetchess/Makefile
  branches/2019Q2/games/powder/Makefile
  branches/2019Q2/games/scourge/Makefile
Directory Properties:
  branches/2019Q2/   (props changed)

Modified: branches/2019Q2/games/billardgl/Makefile
==============================================================================
--- branches/2019Q2/games/billardgl/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/billardgl/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -15,7 +15,7 @@ LICENSE=	GPLv2 # from website
 
 WRKSRC_SUBDIR=	src
 
-USES=		dos2unix
+USES=		compiler dos2unix
 DOS2UNIX_FILES=	Makefile bmp.cpp
 USE_GL=		gl glu glut
 USE_XORG=	x11 xext xmu xi
@@ -25,7 +25,8 @@ PORTDATA=	*
 PLIST_FILES=	bin/billardgl \
 		share/pixmaps/billardgl.bmp
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"" \

Modified: branches/2019Q2/games/brainparty/Makefile
==============================================================================
--- branches/2019Q2/games/brainparty/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/brainparty/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -15,11 +15,12 @@ COMMENT=	Family-friendly set of 36 puzzle games
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake
+USES=		compiler gmake
 USE_SDL=	sdl mixer ttf gfx image
 USE_GL=		gl glu
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 

Modified: branches/2019Q2/games/einstein/Makefile
==============================================================================
--- branches/2019Q2/games/einstein/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/einstein/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -16,10 +16,12 @@ LICENSE=	GPLv2+ # (now dead) website mentions GPL
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
+USES=		compiler
 USE_SDL=	sdl ttf mixer
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/einstein

Modified: branches/2019Q2/games/kobodeluxe/Makefile
==============================================================================
--- branches/2019Q2/games/kobodeluxe/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/kobodeluxe/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -12,12 +12,13 @@ DISTNAME=	KoboDeluxe-${DISTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	SDL port of the scrolling game XKobo
 
-USES=		tar:bzip2
+USES=		compiler tar:bzip2
 USE_SDL=	image sdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sharedstatedir=${SCOREDIR} --enable-oss
 
-CXXFLAGS+=	-Wno-reserved-user-defined-literal
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-reserved-user-defined-literal
 
 SCOREDIR=	/var/games/${PORTNAME}
 

Modified: branches/2019Q2/games/nxengine/Makefile
==============================================================================
--- branches/2019Q2/games/nxengine/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/nxengine/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -29,7 +29,8 @@ USES=		cmake compiler:c++11-lang
 
 USE_SDL=	mixer2 sdl2
 SUB_FILES=	${PORTNAME}
-CXXFLAGS+=	-Wno-error-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-error-narrowing
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-evo

Modified: branches/2019Q2/games/pouetchess/Makefile
==============================================================================
--- branches/2019Q2/games/pouetchess/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/pouetchess/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -12,12 +12,13 @@ COMMENT=	Open-source 3D chess game
 
 LICENSE=	GPLv2  # from sourceforge page
 
-USES=		dos2unix gmake
+USES=		compiler dos2unix gmake
 USE_SDL=	sdl image
 USE_GL=		gl glu
 DOS2UNIX_GLOB=	*.cpp *.h Makefile config.ini
 
-CXXFLAGS+=	-Wno-reserved-user-defined-literal
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-reserved-user-defined-literal
 
 WRKSRC=		${WRKDIR}/pouetChess_0.11
 

Modified: branches/2019Q2/games/powder/Makefile
==============================================================================
--- branches/2019Q2/games/powder/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/powder/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -12,13 +12,14 @@ DISTNAME=	${PORTNAME}${PORTVERSION}_src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Graphical dungeon crawling game
 
-USES=		gmake
+USES=		compiler gmake
 USE_SDL=	sdl
 MAKE_JOBS_UNSAFE=yes
 
 BUILD_WRKSRC=	${WRKSRC}/port/linux
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 PLIST_FILES=	bin/powder
 PORTDOCS=	README.TXT LICENSE.TXT CREDITS.TXT

Modified: branches/2019Q2/games/scourge/Makefile
==============================================================================
--- branches/2019Q2/games/scourge/Makefile	Thu Apr  4 17:38:10 2019	(r497858)
+++ branches/2019Q2/games/scourge/Makefile	Thu Apr  4 17:42:27 2019	(r497859)
@@ -15,12 +15,13 @@ COMMENT=	Rogue-like game
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/config/scourge.cfg:games/scourge-data
 
-USES=		autoreconf gettext gmake localbase
+USES=		autoreconf compiler gettext gmake localbase
 GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_SDL=	sdl image mixer net ttf
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
 



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