summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <junghans@gentoo.org>2017-01-03 22:01:55 -0700
committerChristoph Junghans <junghans@gentoo.org>2017-01-03 22:02:12 -0700
commit01d008ab9f404257b9e71ff8fa3b3634a3197cc6 (patch)
tree2c3adaee7ee9d7c89a75bf27d37812caa6b83ba9
parentdev-python/setuptools-trial: New pkg, dep of buildbot test suite (diff)
downloadgentoo-01d008ab.tar.gz
gentoo-01d008ab.tar.bz2
gentoo-01d008ab.zip
sys-fs/snapraid: fix undefined minor (bug #604478)
Package-Manager: portage-2.3.0
-rw-r--r--sys-fs/snapraid/files/snapraid-11.0-minor.patch39
-rw-r--r--sys-fs/snapraid/snapraid-11.0-r1.ebuild (renamed from sys-fs/snapraid/snapraid-11.0.ebuild)2
2 files changed, 41 insertions, 0 deletions
diff --git a/sys-fs/snapraid/files/snapraid-11.0-minor.patch b/sys-fs/snapraid/files/snapraid-11.0-minor.patch
new file mode 100644
index 000000000000..f212e9a0d575
--- /dev/null
+++ b/sys-fs/snapraid/files/snapraid-11.0-minor.patch
@@ -0,0 +1,39 @@
+From 04dfeea107f81afa50e4888dd7da2f4a9c82d6ee Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni <amadvance@gmail.com>
+Date: Wed, 4 Jan 2017 00:25:56 +0100
+Subject: [PATCH] Tentative fix for major/minor missing
+
+---
+ cmdline/portable.h | 6 ++++++
+ configure.ac | 1 +
+ 2 files changed, 7 insertions(+)
+
+diff --git a/cmdline/portable.h b/cmdline/portable.h
+index 58826c6..059cd38 100644
+--- a/cmdline/portable.h
++++ b/cmdline/portable.h
+@@ -198,6 +198,12 @@
+ #include <sys/types.h>
+ #endif
+
++#if MAJOR_IN_MKDEV
++#include <sys/mkdev.h>
++#elif MAJOR_IN_SYSMACROS
++#include <sys/sysmacros.h>
++#endif
++
+ #if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+diff --git a/configure.ac b/configure.ac
+index 125dae9..8f34f43 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,7 @@ AC_HEADER_ASSERT
+ AC_HEADER_DIRENT
+ AC_HEADER_TIME
+ AC_HEADER_SYS_WAIT
++AC_HEADER_MAJOR
+ AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h limits.h])
+ AC_CHECK_HEADERS([unistd.h getopt.h fnmatch.h io.h inttypes.h byteswap.h])
+ AC_CHECK_HEADERS([pthread.h math.h])
diff --git a/sys-fs/snapraid/snapraid-11.0.ebuild b/sys-fs/snapraid/snapraid-11.0-r1.ebuild
index 7e5c4ae5da3a..82b10c337cdf 100644
--- a/sys-fs/snapraid/snapraid-11.0.ebuild
+++ b/sys-fs/snapraid/snapraid-11.0-r1.ebuild
@@ -14,3 +14,5 @@ KEYWORDS="~amd64 ~x86"
IUSE="test"
DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
+
+PATCHES=( "${FILESDIR}/${P}-minor.patch" )