Date: Tue, 1 Sep 2020 15:20:20 +0000 (UTC) From: Roman Bogorodskiy <novel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547278 - in head/devel/libvirt: . files Message-ID: <202009011520.081FKKCg095010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: novel Date: Tue Sep 1 15:20:20 2020 New Revision: 547278 URL: https://svnweb.freebsd.org/changeset/ports/547278 Log: devel/libvirt: update to 6.7.0 One of the major changes in this update is switching to the Meson build system. Added: head/devel/libvirt/files/patch-src-network-meson.build (contents, props changed) Modified: head/devel/libvirt/Makefile head/devel/libvirt/distinfo head/devel/libvirt/pkg-plist Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Tue Sep 1 15:18:36 2020 (r547277) +++ head/devel/libvirt/Makefile Tue Sep 1 15:20:20 2020 (r547278) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 6.6.0 +PORTVERSION= 6.7.0 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ @@ -30,7 +30,7 @@ OPTIONS_DEFAULT_amd64+= BHYVE .else PLIST_SUB+= BHYVE="@comment " SUB_LIST+= BHYVE="@comment " -CONFIGURE_ARGS+= --without-bhyve +MESON_ARGS+= -Ddriver_bhyve=disabled .endif QEMU_DESC= QEMU driver BHYVE_DESC= bhyve driver @@ -42,50 +42,50 @@ ZFS_DESC= ZFS storage driver OPTIONS_SUB= yes -BHYVE_CONFIGURE_WITH= bhyve +BHYVE_MESON_ENABLED= driver_bhyve -QEMU_CONFIGURE_WITH= qemu +QEMU_MESON_ENABLED= driver_qemu QEMU_RUN_DEPENDS= dmidecode:sysutils/dmidecode \ qemu-io:emulators/qemu NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +NLS_MESON_ENABLED= nls NLS_CFLAGS= -I${LOCALBASE}/include -NSS_CONFIGURE_WITH= nss-plugin +NSS_MESON_ENABLED= nss -READLINE_CONFIGURE_WITH= readline +READLINE_MESON_ENABLED= readline READLINE_USES= readline -SASL_CONFIGURE_WITH= sasl=${LOCALBASE} +SASL_MESON_ENABLED= sasl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -XEN_CONFIGURE_WITH= libxl +XEN_MESON_ENABLED= driver_libxl XEN_CFLAGS= -I${LOCALBASE}/include XEN_LIB_DEPENDS= libxenlight.so:sysutils/xen-tools -LIBSSH_CONFIGURE_WITH= libssh +LIBSSH_MESON_ENABLED= libssh LIBSSH_LIB_DEPENDS= libssh.so:security/libssh -LIBSSH2_CONFIGURE_WITH= ssh2 +LIBSSH2_MESON_ENABLED= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 -ZFS_CONFIGURE_WITH= storage-zfs +ZFS_MESON_ENABLED= storage_zfs VARDIR= /var -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= \ - --without-dbus \ - --without-polkit \ - --without-hal \ - --without-udev \ - --without-netcf \ - --without-sysctl \ - --without-login-shell \ - --without-wireshark-dissector \ - --localstatedir=${VARDIR} -CONFIGURE_OUTSOURCE=yes +MESON_ARGS+= \ + -Ddbus=disabled \ + -Dpolkit=disabled \ + -Dhal=disabled \ + -Dudev=disabled \ + -Dnetcf=disabled \ + -Dsysctl_config=disabled \ + -Dlogin_shell=disabled \ + -Dwireshark_dissector=disabled \ + -Dinit_script=none \ + -Dbash_completion=disabled \ + -Dlocalstatedir=${VARDIR} # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= ac_cv_type_struct_random_data="" @@ -95,8 +95,8 @@ PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector -USES= gnome charsetfix compiler:c++0x cpe gettext-runtime gmake libtool pathfix \ - perl5 python:3.6+,build pkgconfig shebangfix tar:xz +USES= gnome charsetfix compiler:c++0x cpe gettext-runtime gmake libtool \ + meson pathfix perl5 python:3.6+,build pkgconfig shebangfix tar:xz USE_GNOME= glib20 USE_RC_SUBR= libvirtd virtlogd CPE_VENDOR= redhat @@ -104,10 +104,11 @@ USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check -SHLIB_VER= 0.6006.0 +SHLIB_VER= 0.6007.0 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PORTDOCS= * SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen +BINARY_ALIAS= python3=${PYTHON_CMD} SUB_FILES= pkg-message @@ -115,9 +116,9 @@ SUB_FILES= pkg-message .if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS} LIB_DEPENDS+= libyajl.so:devel/yajl -CONFIGURE_ARGS+= --with-yajl +MESON_ARGS+= -Dyajl=enabled .else -CONFIGURE_ARGS+= --without-yajl +MESON_ARGS+= -Dyajl=disabled .endif .if !${PLIST_SUB:MXEN} @@ -143,18 +144,14 @@ CONF_FILES= \ virtxend.conf post-patch: - @${REINPLACE_CMD} -e 's|$$(LN_S) ../default.xml default.xml|true|' \ - -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \ - ${WRKSRC}/src/Makefile.in + ${REINPLACE_CMD} -e 's|HAVE_BSD_NSS|WITH_BSD_NSS|' \ + ${WRKSRC}/tools/nss/libvirt_nss.c \ + ${WRKSRC}/tools/nss/libvirt_nss.h - @${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \ - ${WRKSRC}/src/Makefile.in - post-install: - @${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart @${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in AUTHORS ChangeLog NEWS.rst README.rst +.for doc in AUTHORS NEWS.rst README.rst ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor Modified: head/devel/libvirt/distinfo ============================================================================== --- head/devel/libvirt/distinfo Tue Sep 1 15:18:36 2020 (r547277) +++ head/devel/libvirt/distinfo Tue Sep 1 15:20:20 2020 (r547278) @@ -1,3 +1,3 @@ -TIMESTAMP = 1596469428 -SHA256 (libvirt-6.6.0.tar.xz) = 94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9 -SIZE (libvirt-6.6.0.tar.xz) = 9305836 +TIMESTAMP = 1598949041 +SHA256 (libvirt-6.7.0.tar.xz) = 655b9476c797cdd3bb12e2520acc37335e5299b2d56a5bb9ab3f55db40161342 +SIZE (libvirt-6.7.0.tar.xz) = 8362140 Added: head/devel/libvirt/files/patch-src-network-meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libvirt/files/patch-src-network-meson.build Tue Sep 1 15:20:20 2020 (r547278) @@ -0,0 +1,24 @@ +--- src/network/meson.build.orig 2020-09-01 07:09:12 UTC ++++ src/network/meson.build +@@ -100,7 +100,7 @@ if conf.has('WITH_NETWORK') + ], + capture: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: datadir / 'examples' / 'libvirt' / 'networks', + ) + else + configure_file( +@@ -111,12 +111,6 @@ if conf.has('WITH_NETWORK') + install_dir: confdir / 'qemu' / 'networks', + ) + endif +- +- meson.add_install_script( +- meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), +- confdir / 'qemu' / 'networks' / 'autostart', +- '../default.xml', 'default.xml', +- ) + + if conf.has('WITH_FIREWALLD_ZONE') + install_data( Modified: head/devel/libvirt/pkg-plist ============================================================================== --- head/devel/libvirt/pkg-plist Tue Sep 1 15:18:36 2020 (r547277) +++ head/devel/libvirt/pkg-plist Tue Sep 1 15:20:20 2020 (r547278) @@ -88,8 +88,6 @@ lib/libvirt-qemu.so.%%SHLIB_VER%% lib/libvirt.so lib/libvirt.so.0 lib/libvirt.so.%%SHLIB_VER%% -%%NSS%%lib/libnss_libvirt.so.1 -%%NSS%%lib/libnss_libvirt_guest.so.1 %%NSS%%lib/nss_libvirt.so.1 %%NSS%%lib/nss_libvirt_guest.so.1 libdata/pkgconfig/libvirt-admin.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009011520.081FKKCg095010>