Skip to content

Commit

Permalink
sys-block/fio: fix build w/newer glibc #580592
Browse files Browse the repository at this point in the history
  • Loading branch information
vapier committed Apr 20, 2016
1 parent 0106d8e commit f5ab535
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 0 deletions.
47 changes: 47 additions & 0 deletions sys-block/fio/files/fio-2.8-sysmacros.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
https://bugs.gentoo.org/580592

From a254805d9ca1872adced3f8be2a053211b8f27eb Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
Date: Wed, 20 Apr 2016 12:51:23 -0400
Subject: [PATCH] include sys/sysmacros.h for major/minor

These functions have always been defined in sys/sysmacros.h under
Linux C libraries. For some, including sys/types.h implicitly
includes that as well, but glibc wants to deprecate that, and some
others already have. Include the header explicitly for the funcs.

The mtd change is already in upstream mtd-utils too.

Signed-off-by: Mike Frysinger <[email protected]>
---
os/os-linux.h | 1 +
oslib/libmtd_common.h | 1 +
2 files changed, 2 insertions(+)

diff --git a/os/os-linux.h b/os/os-linux.h
index 9e708f0..23c16b6 100644
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -6,6 +6,7 @@
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/syscall.h>
+#include <sys/sysmacros.h>
#include <sys/vfs.h>
#include <sys/mman.h>
#include <unistd.h>
diff --git a/oslib/libmtd_common.h b/oslib/libmtd_common.h
index a123323..9768066 100644
--- a/oslib/libmtd_common.h
+++ b/oslib/libmtd_common.h
@@ -30,6 +30,7 @@
#include <errno.h>
#include <features.h>
#include <inttypes.h>
+#include <sys/sysmacros.h>

#ifndef PROGRAM_NAME
# error "You must define PROGRAM_NAME before including this header"
--
2.7.4

1 change: 1 addition & 0 deletions sys-block/fio/fio-2.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"

src_prepare() {
epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
Expand Down
1 change: 1 addition & 0 deletions sys-block/fio/fio-2.8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ RDEPEND+="
S="${WORKDIR}/${MY_P}"

src_prepare() {
epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
Expand Down

0 comments on commit f5ab535

Please sign in to comment.