<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eef94180aaa550a758251cc81419647a54521ee6">https://github.com/macports/macports-ports/commit/eef94180aaa550a758251cc81419647a54521ee6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new eef94180aaa libvirt: Fix build on 10.8 and earlier
</span>eef94180aaa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eef94180aaa550a758251cc81419647a54521ee6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 9 21:18:35 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libvirt: Fix build on 10.8 and earlier
</span>---
sysutils/libvirt/Portfile | 13 ++++++-----
sysutils/libvirt/files/net-if.patch | 46 +++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libvirt/Portfile b/sysutils/libvirt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bce8f15383e..abba379febc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/libvirt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libvirt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,10 +7,6 @@ PortGroup legacysupport 1.0
</span> # O_CLOEXEC
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# include sys/socket.h before net/if.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.com/libvirt/libvirt/-/merge_requests/13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Remember to update libvirt and py-libvirt at the same time.
name libvirt
version 6.5.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +29,11 @@ homepage https://libvirt.org
</span> master_sites ${homepage}/sources/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span> port:bash-completion \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:python38 \
port:py38-docutils \
port:perl5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +46,8 @@ depends_lib port:curl \
</span> port:yajl \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles net-if.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # error: You need at least XCode Clang v5.1 to compile QEMU
compiler.blacklist-append apple-gcc* gcc-3.3 *gcc-4.* macports-clang-3.3 {clang < 503}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +110,7 @@ configure.args ac_cv_path_RST2HTML=${prefix}/bin/rst2html-3.8.py \
</span> --with-yajl
# As of 5.10.0, an out-of-source build is required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ../${worksrcdir}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ../${worksrcdir}/autogen.sh --no-git
</span> configure.dir ${workpath}/build
build.dir ${configure.dir}
post-extract {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libvirt/files/net-if.patch b/sysutils/libvirt/files/net-if.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09a141f017f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libvirt/files/net-if.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Include <sys/socket.h> before including <net/if.h> for compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with OS X 10.8 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/libvirt/libvirt/-/merge_requests/13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,7 +381,6 @@ AC_CHECK_HEADERS([\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linux/magic.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mntent.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ net/ethernet.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- net/if.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pty.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pwd.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stdarg.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,6 +392,7 @@ AC_CHECK_HEADERS([\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys/ucred.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xlocale.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_HEADERS([net/if.h], [], [], [[#include <sys/socket.h>]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check whether endian provides handy macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/virnetdev.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/virnetdev.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,10 +18,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_NET_IF_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "virbitmap.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "virsocketaddr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "virmacaddr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +25,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "virnetdevvlan.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "virenum.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_NET_IF_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_STRUCT_IFREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct ifreq virIfreq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>