[gentoo-commits] repo/gentoo:master commit in: sys-cluster/libdlm/files/, sys-cluster/libdlm/

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/libdlm/files/, sys-cluster/libdlm/

[Andreas Hüttel]

commit:     836da927394465e8f086d7ea270ac1f9a8a78041
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 21:49:13 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 21:49:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836da927

sys-cluster/libdlm: Add build fix for glibc-2.26, bug 580296

Closes: https://bugs.gentoo.org/580296
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch | 11 +++++++++++
 sys-cluster/libdlm/libdlm-3.2.0.ebuild                |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
new file mode 100644
index 00000000000..3a8a8b11fa1
--- /dev/null
+++ b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -ruN cluster-3.2.0.orig/dlm/libdlm/libdlm.c cluster-3.2.0/dlm/libdlm/libdlm.c
+--- cluster-3.2.0.orig/dlm/libdlm/libdlm.c	2012-11-26 05:13:22.000000000 +0100
++++ cluster-3.2.0/dlm/libdlm/libdlm.c	2018-04-29 23:46:57.591160008 +0200
+@@ -5,6 +5,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <inttypes.h>

diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
index 84928252827..aebc2e1b0ea 100644
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator epatch
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -33,6 +33,7 @@ src_prepare() {
 	sed -i \
 		-e "s|/lib|/$(get_libdir)|g" \
 		"${WORKDIR}/${MY_P}/make/install.mk" || die "sed failed"
+	epatch "${FILESDIR}/${P}-sysmacros.patch"
 }
 
 src_configure() {