Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/libdlm/files/, sys-cluster/libdlm/
Date: Sun, 29 Apr 2018 21:49:32
Message-Id: 1525038553.836da927394465e8f086d7ea270ac1f9a8a78041.dilfridge@gentoo
1 commit: 836da927394465e8f086d7ea270ac1f9a8a78041
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 21:49:13 2018 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 21:49:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836da927
7
8 sys-cluster/libdlm: Add build fix for glibc-2.26, bug 580296
9
10 Closes: https://bugs.gentoo.org/580296
11 Package-Manager: Portage-2.3.31, Repoman-2.3.9
12
13 sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch | 11 +++++++++++
14 sys-cluster/libdlm/libdlm-3.2.0.ebuild | 5 +++--
15 2 files changed, 14 insertions(+), 2 deletions(-)
16
17 diff --git a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
18 new file mode 100644
19 index 00000000000..3a8a8b11fa1
20 --- /dev/null
21 +++ b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
22 @@ -0,0 +1,11 @@
23 +diff -ruN cluster-3.2.0.orig/dlm/libdlm/libdlm.c cluster-3.2.0/dlm/libdlm/libdlm.c
24 +--- cluster-3.2.0.orig/dlm/libdlm/libdlm.c 2012-11-26 05:13:22.000000000 +0100
25 ++++ cluster-3.2.0/dlm/libdlm/libdlm.c 2018-04-29 23:46:57.591160008 +0200
26 +@@ -5,6 +5,7 @@
27 + #include <sys/ioctl.h>
28 + #include <sys/param.h>
29 + #include <sys/stat.h>
30 ++#include <sys/sysmacros.h>
31 + #include <stdint.h>
32 + #include <stdlib.h>
33 + #include <inttypes.h>
34
35 diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
36 index 84928252827..aebc2e1b0ea 100644
37 --- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
38 +++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
39 @@ -1,9 +1,9 @@
40 -# Copyright 1999-2017 Gentoo Foundation
41 +# Copyright 1999-2018 Gentoo Foundation
42 # Distributed under the terms of the GNU General Public License v2
43
44 EAPI=5
45
46 -inherit multilib toolchain-funcs versionator
47 +inherit multilib toolchain-funcs versionator epatch
48
49 CLUSTER_RELEASE="${PV}"
50 MY_P="cluster-${CLUSTER_RELEASE}"
51 @@ -33,6 +33,7 @@ src_prepare() {
52 sed -i \
53 -e "s|/lib|/$(get_libdir)|g" \
54 "${WORKDIR}/${MY_P}/make/install.mk" || die "sed failed"
55 + epatch "${FILESDIR}/${P}-sysmacros.patch"
56 }
57
58 src_configure() {