Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Sep 2018 08:47:31 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479998 - in head: games/7kaa games/apricots games/chapping games/exult games/ivan games/kartofel games/legesmotus games/stormbaancoureur graphics/glosm
Message-ID:  <201809180847.w8I8lVuI080443@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Tue Sep 18 08:47:31 2018
New Revision: 479998
URL: https://svnweb.freebsd.org/changeset/ports/479998

Log:
  Conditionalize the addition of -Wno-c++11-narrowing to fix clang6 errors
  in CFLAGS to affect clang-based archs.
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/games/7kaa/Makefile
  head/games/apricots/Makefile
  head/games/chapping/Makefile
  head/games/exult/Makefile
  head/games/ivan/Makefile
  head/games/kartofel/Makefile
  head/games/legesmotus/Makefile
  head/games/stormbaancoureur/Makefile
  head/graphics/glosm/Makefile

Modified: head/games/7kaa/Makefile
==============================================================================
--- head/games/7kaa/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/7kaa/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -13,18 +13,20 @@ COMMENT=	Seven Kingdoms: Ancient Adversaries
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libenet.so:net/enet \
-		libcurl.so:ftp/curl
-
 BROKEN_aarch64=		fails to compile: OBULLET.cpp:41:9: constant expression evaluates to -1 which cannot be narrowed to type 'char'
 BROKEN_armv6=		fails to compile: OBULLET.cpp:41:9: constant expression evaluates to -1 which cannot be narrowed to type 'char'
 BROKEN_armv7=		fails to compile: OBULLET.cpp:41:9: constant expression evaluates to -1 which cannot be narrowed to type 'char'
 
+LIB_DEPENDS=	libenet.so:net/enet \
+		libcurl.so:ftp/curl
+
 USES=		compiler:c++11-lib gmake localbase openal:al pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 LLD_UNSAFE=	yes
 CONFIGURE_ARGS=	--disable-nls # no translations ATM
 USE_SDL=	sdl2
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=		-Wno-c++11-narrowing
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.ico

Modified: head/games/apricots/Makefile
==============================================================================
--- head/games/apricots/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/apricots/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.fishies.org.uk/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fly a little plane around and shoot things and drop bombs
 
+USES=		compiler dos2unix
 USE_SDL=	sdl
-USES=		dos2unix
 DOS2UNIX_GLOB=	*.cpp
 SUB_FILES=	${PORTNAME}
 
@@ -22,7 +22,8 @@ PORTDOCS=	*
 CPPFLAGS+=	-DAP_PATH="\"${DATADIR}/\""
 LLD_UNSAFE=	yes
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 DESKTOP_ENTRIES="Apricots" \
 		"${COMMENT}" \

Modified: head/games/chapping/Makefile
==============================================================================
--- head/games/chapping/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/chapping/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -15,10 +15,11 @@ COMMENT=	Turn based board football game
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake tar:bzip2
+USES=		compiler gmake tar:bzip2
 USE_SDL=	sdl image gfx ttf
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 ALL_TARGET=	linux

Modified: head/games/exult/Makefile
==============================================================================
--- head/games/exult/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/exult/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -12,13 +12,13 @@ COMMENT=	Ultima VII engine
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
-		libpng.so:graphics/png
-
 BROKEN_armv6=		fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
 BROKEN_armv7=		fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
 BROKEN_aarch64=		fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
 
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libpng.so:graphics/png
+
 USE_GITHUB=	yes
 GH_TAGNAME=	b15afba
 
@@ -27,6 +27,7 @@ USE_XORG=	xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa \
 		--with-icondir=${PREFIX}/share/pixmaps
+CFLAGS+=	-Wno-c++11-narrowing
 
 SUB_FILES=	pkg-message
 

Modified: head/games/ivan/Makefile
==============================================================================
--- head/games/ivan/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/ivan/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -16,11 +16,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_armv6=		fails to compile: use of overloaded operator '<<' is ambiguous
 BROKEN_armv7=		fails to compile: use of overloaded operator '<<' is ambiguous
 
-USES=		gmake
+USES=		compiler gmake
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 CONFIGURE_ARGS=	--localstatedir=/var/games
 

Modified: head/games/kartofel/Makefile
==============================================================================
--- head/games/kartofel/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/kartofel/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -13,12 +13,13 @@ COMMENT=	Connect the dots in order without crossing ov
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		gmake
+USES=		compiler gmake
 USE_SDL=	sdl gfx mixer image ttf
 
 ALL_TARGET=	default
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 DATA_DIRS=	sounds fonts music images levels
 

Modified: head/games/legesmotus/Makefile
==============================================================================
--- head/games/legesmotus/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/legesmotus/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -18,10 +18,11 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/man" \
 		--datadir="${DATADIR}"
-USES=		gmake
+USES=		compiler gmake
 MAKE_ENV=	XDIR=${LOCALBASE}
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 PORTDATA=	*
 

Modified: head/games/stormbaancoureur/Makefile
==============================================================================
--- head/games/stormbaancoureur/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/games/stormbaancoureur/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -16,11 +16,13 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
 		${LOCALBASE}/lib/libode.a:devel/ode
 
+USES=		compiler
 USE_GL=		gl glu glut
 
 MAKE_ENV=	DATADIR="${DATADIR}"
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 BUILD_WRKSRC=	${WRKSRC}/src-stormbaancoureur
 INSTALL_WRKSRC=	${WRKSRC}/src-stormbaancoureur

Modified: head/graphics/glosm/Makefile
==============================================================================
--- head/graphics/glosm/Makefile	Tue Sep 18 08:43:40 2018	(r479997)
+++ head/graphics/glosm/Makefile	Tue Sep 18 08:47:31 2018	(r479998)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libexpat.so:textproc/expat2
 
-USES=		tar:bzip2 cmake
+USES=		cmake compiler tar:bzip2
 USE_GL=		gl
 USE_XORG=	x11
 USE_SDL=	sdl
@@ -24,7 +24,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
 TEST_TARGET=	test
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 PORTDOCS=	README ChangeLog
 



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