Tue Oct 25 18:42:57 2022 UTC ()
qemu: Make jemalloc support an option.

Enable on everything except SunOS, where the native libumem is a better choice.


(jperkin)
diff -r1.304 -r1.305 pkgsrc/emulators/qemu/Makefile
diff -r1.17 -r1.18 pkgsrc/emulators/qemu/options.mk
cvs diff -r1.304 -r1.305 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2022/09/17 14:05:36 1.304
+++ pkgsrc/emulators/qemu/Makefile 2022/10/25 18:42:57 1.305
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.304 2022/09/17 14:05:36 tnn Exp $ 1# $NetBSD: Makefile,v 1.305 2022/10/25 18:42:57 jperkin Exp $
2 2
3DISTNAME= qemu-7.1.0 3DISTNAME= qemu-7.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+= ninja-build-[0-9]*:../../devel/ninja-build 13TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
14 14
@@ -39,27 +39,26 @@ PALCODE_CLIPPER= palcode-clipper-qemu-5. @@ -39,27 +39,26 @@ PALCODE_CLIPPER= palcode-clipper-qemu-5.
39 39
40DISTFILES= ${DEFAULT_DISTFILES} 40DISTFILES= ${DEFAULT_DISTFILES}
41DISTFILES+= ${PALCODE_CLIPPER} 41DISTFILES+= ${PALCODE_CLIPPER}
42SITES.${PALCODE_CLIPPER}= http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/ 42SITES.${PALCODE_CLIPPER}= http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/
43 43
44CONFIGURE_ARGS+= --prefix=${PREFIX} 44CONFIGURE_ARGS+= --prefix=${PREFIX}
45CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 45CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
46CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 46CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
47CONFIGURE_ARGS+= --python=${PYTHONBIN} 47CONFIGURE_ARGS+= --python=${PYTHONBIN}
48CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 48CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
49CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 49CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
50CONFIGURE_ARGS+= --enable-curses 50CONFIGURE_ARGS+= --enable-curses
51CONFIGURE_ARGS+= --enable-docs 51CONFIGURE_ARGS+= --enable-docs
52CONFIGURE_ARGS+= --enable-jemalloc 
53CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 52CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
54 53
55.if defined(PKGSRC_USE_SSP) 54.if defined(PKGSRC_USE_SSP)
56# do not add flags to everything 55# do not add flags to everything
57PKGSRC_USE_SSP= no 56PKGSRC_USE_SSP= no
58CONFIGURE_ARGS+= --enable-stack-protector 57CONFIGURE_ARGS+= --enable-stack-protector
59.endif 58.endif
60 59
61NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64 60NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
62NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha 61NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
63NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm 62NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
64NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris 63NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
65NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa 64NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa
@@ -183,27 +182,26 @@ post-build: @@ -183,27 +182,26 @@ post-build:
183 182
184post-install: 183post-install:
185 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \ 184 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
186 ${DESTDIR}${PREFIX}/share/doc/qemu/ 185 ${DESTDIR}${PREFIX}/share/doc/qemu/
187 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo 186 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
188 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo 187 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo
189 ${RM} -f ${WRKDIR}/PLIST.STATIC 188 ${RM} -f ${WRKDIR}/PLIST.STATIC
190 cd ${DESTDIR}${PREFIX} && \ 189 cd ${DESTDIR}${PREFIX} && \
191 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC 190 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
192 191
193.include "../../archivers/lzo/buildlink3.mk" 192.include "../../archivers/lzo/buildlink3.mk"
194.include "../../archivers/zstd/buildlink3.mk" 193.include "../../archivers/zstd/buildlink3.mk"
195.include "../../devel/glib2/buildlink3.mk" 194.include "../../devel/glib2/buildlink3.mk"
196.include "../../devel/jemalloc/buildlink3.mk" 
197.include "../../devel/snappy/buildlink3.mk" 195.include "../../devel/snappy/buildlink3.mk"
198.include "../../devel/zlib/buildlink3.mk" 196.include "../../devel/zlib/buildlink3.mk"
199.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 197.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
200.include "../../graphics/png/buildlink3.mk" 198.include "../../graphics/png/buildlink3.mk"
201.include "../../lang/python/tool.mk" 199.include "../../lang/python/tool.mk"
202.include "../../net/libslirp/buildlink3.mk" 200.include "../../net/libslirp/buildlink3.mk"
203.include "../../security/libgcrypt/buildlink3.mk" 201.include "../../security/libgcrypt/buildlink3.mk"
204.include "../../www/curl/buildlink3.mk" 202.include "../../www/curl/buildlink3.mk"
205.include "../../x11/pixman/buildlink3.mk" 203.include "../../x11/pixman/buildlink3.mk"
206.include "../../mk/curses.buildlink3.mk" 204.include "../../mk/curses.buildlink3.mk"
207.include "../../mk/jpeg.buildlink3.mk" 205.include "../../mk/jpeg.buildlink3.mk"
208.include "../../mk/pthread.buildlink3.mk" 206.include "../../mk/pthread.buildlink3.mk"
209.include "../../mk/bsd.pkg.mk" 207.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/emulators/qemu/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/options.mk 2021/12/27 10:12:57 1.17
+++ pkgsrc/emulators/qemu/options.mk 2022/10/25 18:42:57 1.18
@@ -1,37 +1,42 @@ @@ -1,37 +1,42 @@
1# $NetBSD: options.mk,v 1.17 2021/12/27 10:12:57 nia Exp $ 1# $NetBSD: options.mk,v 1.18 2022/10/25 18:42:57 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qemu 3PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
4PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice 4PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice
 5PKG_SUPPORTED_OPTIONS+= jemalloc
5PKG_SUGGESTED_OPTIONS+= iscsi spice 6PKG_SUGGESTED_OPTIONS+= iscsi spice
6 7
7.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
8 9
9.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
10PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper 11PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper
11.endif 12.endif
12 13
13.if ${OPSYS} != "Darwin" 14.if ${OPSYS} != "Darwin"
14# NetBSD<9.0 does not have EGL support in native X11, 15# NetBSD<9.0 does not have EGL support in native X11,
15# so the QEMU OpenGL display driver cannot build. 16# so the QEMU OpenGL display driver cannot build.
16. include "../../graphics/MesaLib/features.mk" 17. include "../../graphics/MesaLib/features.mk"
17. if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss]) 18. if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
18PKG_SUPPORTED_OPTIONS+= opengl 19PKG_SUPPORTED_OPTIONS+= opengl
19PKG_SUGGESTED_OPTIONS+= opengl sdl 20PKG_SUGGESTED_OPTIONS+= opengl sdl
20. else 21. else
21PKG_SUGGESTED_OPTIONS+= sdl 22PKG_SUGGESTED_OPTIONS+= sdl
22. endif 23. endif
23.endif 24.endif
24 25
 26.if ${OPSYS} != "SunOS"
 27PKG_SUGGESTED_OPTIONS+= jemalloc
 28.endif
 29
25.include "../../mk/bsd.options.mk" 30.include "../../mk/bsd.options.mk"
26 31
27PLIST_VARS+= gtk keymap virtfs-proxy-helper 32PLIST_VARS+= gtk keymap virtfs-proxy-helper
28 33
29.if !empty(PKG_OPTIONS:Mjack) 34.if !empty(PKG_OPTIONS:Mjack)
30CONFIGURE_ARGS+= --enable-jack 35CONFIGURE_ARGS+= --enable-jack
31.include "../../audio/jack/buildlink3.mk" 36.include "../../audio/jack/buildlink3.mk"
32.else 37.else
33CONFIGURE_ARGS+= --disable-jack 38CONFIGURE_ARGS+= --disable-jack
34.endif 39.endif
35 40
36.if !empty(PKG_OPTIONS:Mdebug-info) 41.if !empty(PKG_OPTIONS:Mdebug-info)
37CONFIGURE_ARGS+= --enable-debug-info 42CONFIGURE_ARGS+= --enable-debug-info
@@ -86,13 +91,18 @@ CONFIGURE_ARGS+= --disable-virtfs @@ -86,13 +91,18 @@ CONFIGURE_ARGS+= --disable-virtfs
86CONFIGURE_ARGS+= --enable-spice 91CONFIGURE_ARGS+= --enable-spice
87.include "../../sysutils/spice-protocol/buildlink3.mk" 92.include "../../sysutils/spice-protocol/buildlink3.mk"
88.include "../../sysutils/spice-server/buildlink3.mk" 93.include "../../sysutils/spice-server/buildlink3.mk"
89.else 94.else
90CONFIGURE_ARGS+= --disable-spice 95CONFIGURE_ARGS+= --disable-spice
91.endif 96.endif
92 97
93.if !empty(PKG_OPTIONS:Miscsi) 98.if !empty(PKG_OPTIONS:Miscsi)
94CONFIGURE_ARGS+= --enable-libiscsi 99CONFIGURE_ARGS+= --enable-libiscsi
95.include "../../net/libiscsi/buildlink3.mk" 100.include "../../net/libiscsi/buildlink3.mk"
96.else 101.else
97CONFIGURE_ARGS+= --disable-libiscsi 102CONFIGURE_ARGS+= --disable-libiscsi
98.endif 103.endif
 104
 105.if !empty(PKG_OPTIONS:Mjemalloc)
 106CONFIGURE_ARGS+= --enable-jemalloc
 107.include "../../devel/jemalloc/buildlink3.mk"
 108.endif