pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: Make jemalloc support an option.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e93e8f6cd6f4
branches:  trunk
changeset: 387263:e93e8f6cd6f4
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Oct 25 18:42:57 2022 +0000

description:
qemu: Make jemalloc support an option.

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

diffstat:

 emulators/qemu/Makefile   |   4 +---
 emulators/qemu/options.mk |  12 +++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 7f41d55d5650 -r e93e8f6cd6f4 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Tue Oct 25 18:36:42 2022 +0000
+++ b/emulators/qemu/Makefile   Tue Oct 25 18:42:57 2022 +0000
@@ -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+=       --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 @@
 .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"
diff -r 7f41d55d5650 -r e93e8f6cd6f4 emulators/qemu/options.mk
--- a/emulators/qemu/options.mk Tue Oct 25 18:36:42 2022 +0000
+++ b/emulators/qemu/options.mk Tue Oct 25 18:42:57 2022 +0000
@@ -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 @@
 .  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 @@
 .else
 CONFIGURE_ARGS+=       --disable-libiscsi
 .endif
+
+.if !empty(PKG_OPTIONS:Mjemalloc)
+CONFIGURE_ARGS+=       --enable-jemalloc
+.include "../../devel/jemalloc/buildlink3.mk"
+.endif



Home | Main Index | Thread Index | Old Index