From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C9AFB59CB2 for ; Thu, 14 Apr 2016 04:03:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 231EC21C003; Thu, 14 Apr 2016 04:03:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A67AB21C003 for ; Thu, 14 Apr 2016 04:03:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87CE7340DC2 for ; Thu, 14 Apr 2016 04:03:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 402AB80 for ; Thu, 14 Apr 2016 04:03:32 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1460606592.6db2e20c272323a10ea3afe3741f8c282bfa2d6a.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/, net-fs/nfs-utils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch net-fs/nfs-utils/nfs-utils-1.3.3.ebuild X-VCS-Directories: net-fs/nfs-utils/ net-fs/nfs-utils/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 6db2e20c272323a10ea3afe3741f8c282bfa2d6a X-VCS-Branch: master Date: Thu, 14 Apr 2016 04:03:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: babb5203-3452-4022-ad06-621dd5903f89 X-Archives-Hash: 4f564752ca5de73a86b032def6d4c50d commit: 6db2e20c272323a10ea3afe3741f8c282bfa2d6a Author: Mike Frysinger gentoo org> AuthorDate: Thu Apr 14 04:03:07 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Apr 14 04:03:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db2e20c net-fs/nfs-utils: fix building w/newer glibc #579884 .../files/nfs-utils-1.3.3-sysmacros.patch | 78 ++++++++++++++++++++++ net-fs/nfs-utils/nfs-utils-1.3.3.ebuild | 1 + 2 files changed, 79 insertions(+) diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch new file mode 100644 index 0000000..6384425 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch @@ -0,0 +1,78 @@ +From 187f0e8298a3dd405b5aa817df129198d6f66eeb Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 14 Apr 2016 00:01:05 -0400 +Subject: [PATCH nfs-utils] fix building w/newer C libraries + +Linux C libraries are moving away from implicitly including the header +sys/sysmacros.h via sys/types.h. We would like to do this for glibc +now, but others (musl/etc...) have been doing it already. This means +any code using major/minor/makedevs functions will fail to build when +they don't include that header. + +Leverage the AC_HEADER_MAJOR macro that configure is already using to +pull in the right header. + +Signed-off-by: Mike Frysinger +--- + support/include/xcommon.h | 6 ++++++ + support/nfs/nfsexport.c | 1 + + utils/blkmapd/device-discovery.c | 1 + + utils/mountd/cache.c | 1 + + 4 files changed, 9 insertions(+) + +diff --git a/support/include/xcommon.h b/support/include/xcommon.h +index d1a4b18..23c9a13 100644 +--- a/support/include/xcommon.h ++++ b/support/include/xcommon.h +@@ -17,6 +17,12 @@ + #include + #include + ++#ifdef MAJOR_IN_MKDEV ++#include ++#elif defined(MAJOR_IN_SYSMACROS) ++#include ++#endif ++ + #define streq(s, t) (strcmp ((s), (t)) == 0) + + /* Functions in sundries.c that are used in mount.c and umount.c */ +diff --git a/support/nfs/nfsexport.c b/support/nfs/nfsexport.c +index afd7c90..4b13265 100644 +--- a/support/nfs/nfsexport.c ++++ b/support/nfs/nfsexport.c +@@ -19,6 +19,7 @@ + + #include "nfslib.h" + #include "misc.h" ++#include "xcommon.h" + + /* if /proc/net/rpc/... exists, then + * write to it, as that interface is more stable. +diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c +index b010628..052d582 100644 +--- a/utils/blkmapd/device-discovery.c ++++ b/utils/blkmapd/device-discovery.c +@@ -51,6 +51,7 @@ + #include + + #include "device-discovery.h" ++#include "xcommon.h" + + #define EVENT_SIZE (sizeof(struct inotify_event)) + #define EVENT_BUFSIZE (1024 * EVENT_SIZE) +diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c +index 7847446..ec86a22 100644 +--- a/utils/mountd/cache.c ++++ b/utils/mountd/cache.c +@@ -31,6 +31,7 @@ + #include "mountd.h" + #include "fsloc.h" + #include "pseudoflavors.h" ++#include "xcommon.h" + + #ifdef USE_BLKID + #include "blkid/blkid.h" +-- +2.7.4 + diff --git a/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild index 06740c3..f7f8aa3 100644 --- a/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild @@ -58,6 +58,7 @@ DEPEND="${DEPEND_COMMON} src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch + epatch "${FILESDIR}"/${PN}-1.3.3-sysmacros.patch #579884 sed \ -e "/^sbindir/s:= := \"${EPREFIX}\":g" \