Thu Dec 29 22:59:39 2016 UTC ()
Fix build with SSP.

Closes my PR 51479.


(wiz)
diff -r1.158 -r1.159 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.158 -r1.159 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2016/12/27 21:44:42 1.158
+++ pkgsrc/emulators/qemu/Makefile 2016/12/29 22:59:39 1.159
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.158 2016/12/27 21:44:42 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.159 2016/12/29 22:59:39 wiz Exp $
2 2
3DISTNAME= qemu-2.7.0 3DISTNAME= qemu-2.7.0
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= http://wiki.qemu.org/download/ 5MASTER_SITES= http://wiki.qemu.org/download/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7PKGREVISION= 1 7PKGREVISION= 1
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu.org/ 10HOMEPAGE= http://www.qemu.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14CONFLICTS+= qemu-bin-[0-9]* 14CONFLICTS+= qemu-bin-[0-9]*
@@ -28,26 +28,32 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../ @@ -28,26 +28,32 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30CONFIGURE_ARGS+= --prefix=${PREFIX} 30CONFIGURE_ARGS+= --prefix=${PREFIX}
31CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 31CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
33CONFIGURE_ARGS+= --python=${PYTHONBIN} 33CONFIGURE_ARGS+= --python=${PYTHONBIN}
34CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 34CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
35CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 35CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
36CONFIGURE_ARGS+= --enable-curses 36CONFIGURE_ARGS+= --enable-curses
37#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X 37#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X
38CONFIGURE_ARGS+= --disable-opengl 38CONFIGURE_ARGS+= --disable-opengl
39CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 39CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
40 40
 41.if defined(PKGSRC_USE_SSP)
 42# do not add flags to everything
 43PKGSRC_USE_SSP= no
 44CONFIGURE_ARGS+= --enable-stack-protector
 45.endif
 46
41NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64 47NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
42NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha 48NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
43NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm 49NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
44NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris 50NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
45NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386 51NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386
46NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-lm32 52NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-lm32
47NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-m68k 53NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-m68k
48NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblaze 54NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblaze
49NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblazeel 55NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblazeel
50NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips 56NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips
51NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64 57NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64
52NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64el 58NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64el
53NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mipsel 59NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mipsel