From owner-svn-ports-head@FreeBSD.ORG Mon Jan 19 18:46:51 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E411E61E; Mon, 19 Jan 2015 18:46:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D01AE79E; Mon, 19 Jan 2015 18:46:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JIkpUH078471; Mon, 19 Jan 2015 18:46:51 GMT (envelope-from nox@FreeBSD.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JIkpNP078470; Mon, 19 Jan 2015 18:46:51 GMT (envelope-from nox@FreeBSD.org) Message-Id: <201501191846.t0JIkpNP078470@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nox set sender to nox@FreeBSD.org using -f From: Juergen Lock Date: Mon, 19 Jan 2015 18:46:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377449 - head/emulators/qemu 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 18:46:52 -0000 Author: nox Date: Mon Jan 19 18:46:51 2015 New Revision: 377449 URL: https://svnweb.freebsd.org/changeset/ports/377449 QAT: https://qat.redports.org/buildarchive/r377449/ Log: Fix build on 10+/i386 for when gcc49 becomes default (and fix ALL_TARGETS on 10+/i386 while we're at it.) PR: 196855 Submitted by: gerald Modified: head/emulators/qemu/Makefile Modified: head/emulators/qemu/Makefile ============================================================================== --- head/emulators/qemu/Makefile Mon Jan 19 18:10:31 2015 (r377448) +++ head/emulators/qemu/Makefile Mon Jan 19 18:46:51 2015 (r377449) @@ -14,8 +14,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= QEMU CPU Emulator HAS_CONFIGURE= yes -USE_GCC= any -USES= gmake perl5 +USES= gmake perl5 compiler:features USE_PERL5= build PATCH_STRIP= -p1 MAKE_ENV+= BSD_MAKE="${MAKE}" @@ -39,6 +38,14 @@ OPTIONS_DEFAULT= SDL GNUTLS CURL PCAP GN .include +.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang" +# gcc49 breaks target-i386 on i386, and gcc48 breaks ALL_TARGETS on i386: +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196855 +USE_GCC= 4.7 +.else +USE_GCC= any +.endif + .if empty(PORT_OPTIONS:MALL_TARGETS) CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu PLIST_SUB+= ALLTARGETS="@comment "