Sun Sep 17 12:14:48 2023 UTC ()
qemu: move rsp threshold to ALL_ENV to fix incremental builds


(tnn)
diff -r1.322 -r1.323 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.322 -r1.323 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2023/09/16 13:20:51 1.322
+++ pkgsrc/emulators/qemu/Makefile 2023/09/17 12:14:47 1.323
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.322 2023/09/16 13:20:51 tnn Exp $ 1# $NetBSD: Makefile,v 1.323 2023/09/17 12:14:47 tnn Exp $
2 2
3DISTNAME= qemu-8.1.0 3DISTNAME= qemu-8.1.0
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= https://download.qemu.org/ 5MASTER_SITES= https://download.qemu.org/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.qemu.org/ 9HOMEPAGE= https://www.qemu.org/
10COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
12 12
13TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson 13TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson
14TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 14TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
@@ -39,27 +39,27 @@ PALCODE_CLIPPER= palcode-clipper-qemu-5. @@ -39,27 +39,27 @@ PALCODE_CLIPPER= palcode-clipper-qemu-5.
39DISTFILES= ${DEFAULT_DISTFILES} 39DISTFILES= ${DEFAULT_DISTFILES}
40DISTFILES+= ${PALCODE_CLIPPER} 40DISTFILES+= ${PALCODE_CLIPPER}
41SITES.${PALCODE_CLIPPER}= http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/ 41SITES.${PALCODE_CLIPPER}= http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/
42 42
43CONFIGURE_ARGS+= --prefix=${PREFIX} 43CONFIGURE_ARGS+= --prefix=${PREFIX}
44CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 44CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
45CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 45CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
46CONFIGURE_ARGS+= --python=${PYTHONBIN} 46CONFIGURE_ARGS+= --python=${PYTHONBIN}
47CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 47CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
48CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 48CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
49CONFIGURE_ARGS+= --enable-curses 49CONFIGURE_ARGS+= --enable-curses
50CONFIGURE_ARGS+= --enable-docs 50CONFIGURE_ARGS+= --enable-docs
51CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 51CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
52CONFIGURE_ENV+= MESON_RSP_THRESHOLD=262144 52ALL_ENV+= MESON_RSP_THRESHOLD=262144
53 53
54.if defined(PKGSRC_USE_SSP) 54.if defined(PKGSRC_USE_SSP)
55# do not add flags to everything 55# do not add flags to everything
56PKGSRC_USE_SSP= no 56PKGSRC_USE_SSP= no
57CONFIGURE_ARGS+= --enable-stack-protector 57CONFIGURE_ARGS+= --enable-stack-protector
58.endif 58.endif
59 59
60NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64 60NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
61NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha 61NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
62NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm 62NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
63NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris 63NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
64NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa 64NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa
65NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386 65NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386