Skip to content

Commit

Permalink
app-emulation/libvirt: version bump to 1.3.4, bug #580418, bug #579960
Browse files Browse the repository at this point in the history
 - bump to version 1.3.4, bug #580418

 - apply a build system patch for the sysmacros header change, bug #579960
   fixes the compile error "undefined reference to {'major', 'minor'}"
   due to gentoo specific glibc patches (bug #575232)

Package-Manager: portage-2.2.26
  • Loading branch information
tamiko committed May 1, 2016
1 parent f746733 commit af621c3
Show file tree
Hide file tree
Showing 4 changed files with 475 additions and 1 deletion.
1 change: 1 addition & 0 deletions app-emulation/libvirt/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ DIST libvirt-1.3.0-20151222.tar.xz 1684 SHA256 3628c3398862eae2966ccf0e55822e4cb
DIST libvirt-1.3.0.tar.gz 30114683 SHA256 ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64 SHA512 e252390a05b76e9cd9ed02caadd0ee0d674505f60940bb6ced955e17f69c7dd55fe5b38204ae5c25b6e5703415a0f6a12fc545d138d0e8b016457a85dc8fa2b8 WHIRLPOOL 852c592b27be86d3fb2ec75ca5debf9a1e0ac5de6d1ab06c55c2d70e83de125d10c2fc967b7578fba9137ed7a30b7a7e195f4e5f8d35708deeeddc97424d5e40
DIST libvirt-1.3.1.tar.gz 29900143 SHA256 a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a SHA512 a109c09d947f7c5e924fdbc9c9b6c0a9d6ff64d9411aedd9a3e710d20f749b088ff9895e882dd888b88bfea7724a8933534be4078f16cb9d2047da761515e804 WHIRLPOOL 62fb8486bfa53d55b397d9a90750d32a83f0a73cf2e6685f296489390abf9c62efc69fecd6d011fc51e9f562f75f5b8ce03208c350e98d20de0a5560721c675e
DIST libvirt-1.3.2.tar.gz 30056101 SHA256 e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05 SHA512 bcca111204c42db3a199c7d35758e78bcd9da557f091cb690dd712912aeee0ee89afa37a427ad972b94cc8ea9ed0788ff555a9042a9bab5ad0b55ca0d13aed1c WHIRLPOOL 551c4232e4890515276824e96a4379cc4908b71ac2d7ad27e4a1f7c78cc0ca39223422c17fee929d5dce090af03eaba5b5bd7ef83b0fc995dcac03398ef5d43b
DIST libvirt-1.3.4.tar.gz 30493908 SHA256 e2396ebebb3f3fdb50429ce8faa99559f6e8e3cc0493d5fa0c1999db189c25bd SHA512 6f85e4cd8a696da729bb88368c608694119258c6ab7f9b99f41c34a6cc4492d9ad90b8ff1574fd4ee6c78c674a3a501db60d1d3ba898f7013321ecc996612919 WHIRLPOOL af4a8a0e3d746f50e0f9d95e3920c023c5bbec0d7c641f43aea580db9b95a793027f7579ecd94625a68b7e3662c328d94b7b2d243afea60a8d2f31cab1cc9319
86 changes: 86 additions & 0 deletions app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
get major/minor macros by using AC_HEADER_MAJOR

https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html#AC_HEADER_MAJOR

https://bugs.gentoo.org/579960
diff --git a/configure.ac b/configure.ac
index 93d347c..1e7ee51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,2 +282,5 @@ AC_CHECK_SIZEOF([long])

+dnl detect system-specific headers for major()/minor()
+AC_HEADER_MAJOR
+
dnl Availability of various common functions (non-fatal if missing),
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index bd2eeb6..74b2487 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -28,2 +28,9 @@

+#ifdef MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
+#endif
+
#include "domain_audit.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 76bef82..49c0648 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -48,2 +48,9 @@

+#ifdef MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
+#endif
+
#include "virerror.h"
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3c6c839..983cd21 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -38,2 +38,9 @@

+#ifdef MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
+#endif
+
#include "virerror.h"
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 38398fd..4b45458 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -31,2 +31,10 @@
#endif
+
+#ifdef MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
+#endif
+
#include <fcntl.h>
diff --git a/src/util/virutil.c b/src/util/virutil.c
index bb9604a..9840a9e 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -68,2 +68,9 @@

+#ifdef MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
+#endif
+
#include "c-ctype.h"
Loading

0 comments on commit af621c3

Please sign in to comment.