Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 17FFE7A276 for ; Thu, 29 Dec 2016 22:59:41 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BC562855EA; Thu, 29 Dec 2016 22:59:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4D6B48559F for ; Thu, 29 Dec 2016 22:59:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id T5poDsD8kGwR for ; Thu, 29 Dec 2016 22:59:39 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8BFDC855D6 for ; Thu, 29 Dec 2016 22:59:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8155CFBA6; Thu, 29 Dec 2016 22:59:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1483052379282440" MIME-Version: 1.0 Date: Thu, 29 Dec 2016 22:59:39 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/emulators/qemu To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161229225939.8155CFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1483052379282440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Dec 29 22:59:39 UTC 2016 Modified Files: pkgsrc/emulators/qemu: Makefile Log Message: Fix build with SSP. Closes my PR 51479. To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 pkgsrc/emulators/qemu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1483052379282440 Content-Disposition: inline Content-Length: 859 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/qemu/Makefile diff -u pkgsrc/emulators/qemu/Makefile:1.158 pkgsrc/emulators/qemu/Makefile:1.159 --- pkgsrc/emulators/qemu/Makefile:1.158 Tue Dec 27 21:44:42 2016 +++ pkgsrc/emulators/qemu/Makefile Thu Dec 29 22:59:39 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.158 2016/12/27 21:44:42 bsiegert Exp $ +# $NetBSD: Makefile,v 1.159 2016/12/29 22:59:39 wiz Exp $ DISTNAME= qemu-2.7.0 CATEGORIES= emulators @@ -38,6 +38,12 @@ CONFIGURE_ARGS+= --enable-curses CONFIGURE_ARGS+= --disable-opengl CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} +.if defined(PKGSRC_USE_SSP) +# do not add flags to everything +PKGSRC_USE_SSP= no +CONFIGURE_ARGS+= --enable-stack-protector +.endif + NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64 NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm --_----------=_1483052379282440--