CVS commit: pkgsrc/emulators/qemu

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 25 18:42:57 UTC 2022

Modified Files:
        pkgsrc/emulators/qemu: Makefile options.mk

Log Message:
qemu: Make jemalloc support an option.

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


To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/emulators/qemu/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.304 pkgsrc/emulators/qemu/Makefile:1.305
--- pkgsrc/emulators/qemu/Makefile:1.304        Sat Sep 17 14:05:36 2022
+++ pkgsrc/emulators/qemu/Makefile      Tue Oct 25 18:42:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.304 2022/09/17 14:05:36 tnn Exp $
+# $NetBSD: Makefile,v 1.305 2022/10/25 18:42:57 jperkin Exp $
 
 DISTNAME=      qemu-7.1.0
 CATEGORIES=    emulators
@@ -49,7 +49,6 @@ CONFIGURE_ARGS+=      --smbd=${PREFIX}/sbin/s
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --enable-curses
 CONFIGURE_ARGS+=       --enable-docs
-CONFIGURE_ARGS+=       --enable-jemalloc
 CONFIGURE_ENV+=                mansuffix=/${PKGMANDIR}
 
 .if defined(PKGSRC_USE_SSP)
@@ -193,7 +192,6 @@ post-install:
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/jemalloc/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.17 pkgsrc/emulators/qemu/options.mk:1.18
--- pkgsrc/emulators/qemu/options.mk:1.17       Mon Dec 27 10:12:57 2021
+++ pkgsrc/emulators/qemu/options.mk    Tue Oct 25 18:42:57 2022
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.17 2021/12/27 10:12:57 nia Exp $
+# $NetBSD: options.mk,v 1.18 2022/10/25 18:42:57 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice
+PKG_SUPPORTED_OPTIONS+=        jemalloc
 PKG_SUGGESTED_OPTIONS+=        iscsi spice
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -22,6 +23,10 @@ PKG_SUGGESTED_OPTIONS+=      sdl
 .  endif
 .endif
 
+.if ${OPSYS} != "SunOS"
+PKG_SUGGESTED_OPTIONS+=        jemalloc
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=           gtk keymap virtfs-proxy-helper
@@ -96,3 +101,8 @@ CONFIGURE_ARGS+=     --enable-libiscsi
 .else
 CONFIGURE_ARGS+=       --disable-libiscsi
 .endif
+
+.if !empty(PKG_OPTIONS:Mjemalloc)
+CONFIGURE_ARGS+=       --enable-jemalloc
+.include "../../devel/jemalloc/buildlink3.mk"
+.endif