[gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/files/, sys-fs/diskdev_cmds/

[Sergei Trofimovich]

commit:     0e18040d345fe623061142cca2a8e0c43ff332e8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 20:43:21 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 20:43:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e18040d

sys-fs/diskdev_cmds: tweak for glibc-2.32

It does not fix build on musl but fixes build on glibc-2.32.

Reported-by: Georg Rudoy
Bug: https://bugs.gentoo.org/715862
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild         |  1 +
 .../files/diskdev_cmds-332.14_p1-no-sysctl.patch             | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
index d65d92da320..57753cb339c 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
 	"${WORKDIR}"/diskdev_cmds-${PV}.patch
 	"${FILESDIR}"/${PN}-respect-cflags.patch
 	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-no-sysctl.patch
 )
 
 src_compile() {

diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch
new file mode 100644
index 00000000000..f7ff186ca19
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch
@@ -0,0 +1,12 @@
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -37,8 +37,8 @@
+ #endif
+ #include <sys/errno.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #if !LINUX
++#include <sys/sysctl.h>
+ #include <sys/vmmeter.h>
+ #endif
+