svn commit: r377449 - head/emulators/qemu

Juergen Lock nox at FreeBSD.org
Mon Jan 19 18:46:52 UTC 2015


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 at 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 <bsd.port.pre.mk>
 
+.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 "


More information about the svn-ports-all mailing list