From owner-svn-ports-head@FreeBSD.ORG Mon Mar 25 09:28:04 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 89FF1272;
Mon, 25 Mar 2013 09:28:04 +0000 (UTC)
(envelope-from madpilot@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7D2639B9;
Mon, 25 Mar 2013 09:28:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2P9S4uE052966;
Mon, 25 Mar 2013 09:28:04 GMT
(envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2P9S4hS052965;
Mon, 25 Mar 2013 09:28:04 GMT
(envelope-from madpilot@svn.freebsd.org)
Message-Id: <201303250928.r2P9S4hS052965@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Mon, 25 Mar 2013 09:28:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r315207 - head/games/corsix-th
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Mar 2013 09:28:04 -0000
Author: madpilot
Date: Mon Mar 25 09:28:03 2013
New Revision: 315207
URL: http://svnweb.freebsd.org/changeset/ports/315207
Log:
Since the code which base gcc is unable to handle on i386 is in the
in game movie part of the source, force usage of alternative compilers
only when the MOVIES option is selected.
Modified:
head/games/corsix-th/Makefile
Modified: head/games/corsix-th/Makefile
==============================================================================
--- head/games/corsix-th/Makefile Mon Mar 25 09:27:31 2013 (r315206)
+++ head/games/corsix-th/Makefile Mon Mar 25 09:28:03 2013 (r315207)
@@ -31,10 +31,6 @@ MOVIES_DESC= Play in-game movies
.if ${PORT_OPTIONS:MMOVIES}
CMAKE_ARGS+= -DWITH_MOVIES=ON
LIB_DEPENDS+= swresample1:${PORTSDIR}/multimedia/ffmpeg1
-.else
-CMAKE_ARGS+= -DWITH_MOVIES=OFF
-.endif
-
# partly copied from editors/libreoffice
.if ${ARCH} == "i386"
.if exists(/usr/bin/clang) && ${OSVERSION} > 900014
@@ -45,6 +41,9 @@ CXX= /usr/bin/clang++
USE_GCC= 4.6+
.endif
.endif
+.else
+CMAKE_ARGS+= -DWITH_MOVIES=OFF
+.endif
post-patch:
# Allow the game to find its resources without wrapper scripts