diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-10-20 23:28:30 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-10-20 23:28:30 +0200 |
| commit | 671e279dc14f829cf52b0bf95df2b4221edf54ba (patch) | |
| tree | b25270bb7002e2bf94fdb3f69a8928ca8d3135db /sys-cluster | |
| parent | app-admin/radmind: Fix build with glibc-2.25, bug 580916 (diff) | |
| download | gentoo-671e279dc14f829cf52b0bf95df2b4221edf54ba.tar.gz gentoo-671e279dc14f829cf52b0bf95df2b4221edf54ba.tar.bz2 gentoo-671e279dc14f829cf52b0bf95df2b4221edf54ba.zip | |
sys-cluster/vzctl: Fix build with glibc-2.25, bug 604230
Closes: https://bugs.gentoo.org/604230
Package-Manager: Portage-2.3.12, Repoman-2.3.3
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch | 33 | ||||
| -rw-r--r-- | sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch | 11 | ||||
| -rw-r--r-- | sys-cluster/vzctl/vzctl-4.9.4.ebuild | 5 |
3 files changed, 48 insertions, 1 deletions
diff --git a/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch new file mode 100644 index 000000000000..de8eca658c0a --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch @@ -0,0 +1,33 @@ +diff -ruN vzctl-4.9.4.orig/src/lib/dev.c vzctl-4.9.4/src/lib/dev.c +--- vzctl-4.9.4.orig/src/lib/dev.c 2017-10-20 23:22:14.689240049 +0200 ++++ vzctl-4.9.4/src/lib/dev.c 2017-10-20 23:24:28.972830730 +0200 +@@ -19,6 +19,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <unistd.h> + #include <errno.h> +diff -ruN vzctl-4.9.4.orig/src/lib/hooks_ct.c vzctl-4.9.4/src/lib/hooks_ct.c +--- vzctl-4.9.4.orig/src/lib/hooks_ct.c 2015-08-27 01:41:24.000000000 +0200 ++++ vzctl-4.9.4/src/lib/hooks_ct.c 2017-10-20 23:24:14.508659254 +0200 +@@ -5,6 +5,7 @@ + #include <string.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/wait.h> + #include <sys/mount.h> + #include <fcntl.h> +diff -ruN vzctl-4.9.4.orig/src/lib/vps_configure.c vzctl-4.9.4/src/lib/vps_configure.c +--- vzctl-4.9.4.orig/src/lib/vps_configure.c 2015-08-27 01:41:24.000000000 +0200 ++++ vzctl-4.9.4/src/lib/vps_configure.c 2017-10-20 23:26:01.848931798 +0200 +@@ -24,6 +24,7 @@ + #include <sys/stat.h> + #include <netinet/in.h> + #include <linux/vzcalluser.h> ++#include <sys/sysmacros.h> + + #include "vzerror.h" + #include "logger.h" diff --git a/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch new file mode 100644 index 000000000000..87f86270bdd9 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch @@ -0,0 +1,11 @@ +diff -ruN vzctl-4.9.4.orig/src/lib/config.c vzctl-4.9.4/src/lib/config.c +--- vzctl-4.9.4.orig/src/lib/config.c 2015-08-27 01:41:24.000000000 +0200 ++++ vzctl-4.9.4/src/lib/config.c 2017-10-20 23:19:14.651115558 +0200 +@@ -25,6 +25,7 @@ + #include <arpa/inet.h> + #include <getopt.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <linux/vzcalluser.h> + #include <unistd.h> diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild index 5623e9d70c87..c3aab29cb491 100644 --- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild +++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild @@ -41,11 +41,14 @@ DEPEND="${RDEPEND} " src_prepare() { - # Set default OSTEMPLATE on gentoo sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' # Set proper udev directory sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' + + epatch "${FILESDIR}/${P}-glibc225.patch" + epatch "${FILESDIR}/${P}-glibc225-2.patch" + epatch_user } src_configure() { |