From owner-svn-ports-head@freebsd.org  Fri Aug 28 16:17:46 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B167C3B61C8;
 Fri, 28 Aug 2020 16:17:46 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BdPrp3jRpz3XkZ;
 Fri, 28 Aug 2020 16:17:46 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62E14178B1;
 Fri, 28 Aug 2020 16:17:46 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07SGHkU7045519;
 Fri, 28 Aug 2020 16:17:46 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07SGHk95045518;
 Fri, 28 Aug 2020 16:17:46 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <202008281617.07SGHk95045518@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Fri, 28 Aug 2020 16:17:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r546747 - head/games/cdogs-sdl
X-SVN-Group: ports-head
X-SVN-Commit-Author: tcberner
X-SVN-Commit-Paths: head/games/cdogs-sdl
X-SVN-Commit-Revision: 546747
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Aug 2020 16:17:46 -0000

Author: tcberner
Date: Fri Aug 28 16:17:45 2020
New Revision: 546747
URL: https://svnweb.freebsd.org/changeset/ports/546747

Log:
  games/cogs-sdl: fix build on recent current
  
  - upstream has some WIP to fix build with gcc10:
  	https://github.com/cxong/cdogs-sdl/commit/ee2b3acd126aeb091bfb115a6d25a25159e4d357
  - unfortunately this was not enough, as it did not address the duplicte symbols

Modified:
  head/games/cdogs-sdl/Makefile

Modified: head/games/cdogs-sdl/Makefile
==============================================================================
--- head/games/cdogs-sdl/Makefile	Fri Aug 28 16:09:15 2020	(r546746)
+++ head/games/cdogs-sdl/Makefile	Fri Aug 28 16:17:45 2020	(r546747)
@@ -15,4 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cxong
 CMAKE_ARGS=	-DCDOGS_DATA_DIR=${DATADIR}/
 
+# Fix with clang11
+CFLAGS+=	-fcommon
+
 .include <bsd.port.mk>