public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/
Date: Tue, 19 Apr 2016 22:12:55 +0000 (UTC)	[thread overview]
Message-ID: <1461103967.874bc61700f87a6c5396dc4225154a60d538ec56.vapier@gentoo> (raw)

commit:     874bc61700f87a6c5396dc4225154a60d538ec56
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 22:12:41 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 22:12:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874bc617

sys-fs/mdadm: fix build w/newer glibc #580188

 sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch | 31 ++++++++++++++++++++++++++++
 sys-fs/mdadm/mdadm-3.4.ebuild                |  4 ++++
 2 files changed, 35 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch b/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch
new file mode 100644
index 0000000..22a3934
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/580188
+
+From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 18:10:54 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes
+
+These funcs are defined in sys/sysmacros.h, so include it for them.
+It works today due to an implicit include by sys/types.h, but the
+various Linux C libraries are moving away from that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ mdadm.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdadm.h b/mdadm.h
+index d209488..b8767a7 100755
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ # endif
+ #endif
+ 
++#include	<sys/sysmacros.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<stdint.h>
+-- 
+2.7.4
+

diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
index a4aff3e..559b74e 100644
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.4.ebuild
@@ -24,6 +24,10 @@ RDEPEND=">=sys-apps/util-linux-2.16"
 # Thus, they shouldn't be run on systems with active software RAID devices.
 RESTRICT="test"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
+}
+
 mdadm_emake() {
 	# We should probably make corosync & libdlm into USE flags. #573782
 	emake \


             reply	other threads:[~2016-04-19 22:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 22:12 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-01-03  7:41 [gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/ Sam James
2024-03-30 19:48 Mike Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461103967.874bc61700f87a6c5396dc4225154a60d538ec56.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox