diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-04-19 23:16:34 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-04-19 23:16:34 -0400 |
| commit | 06022126809462809479739c0a86e2139b4f8410 (patch) | |
| tree | 72fd175c09f426adca4a4ff5111ceb1a011e5c5f /sys-fs | |
| parent | sys-fs/udisks: fix build w/newer glibc #580230 (diff) | |
| download | gentoo-06022126809462809479739c0a86e2139b4f8410.tar.gz gentoo-06022126809462809479739c0a86e2139b4f8410.tar.bz2 gentoo-06022126809462809479739c0a86e2139b4f8410.zip | |
sys-fs/udev: add upstream fix for building w/glibc #580200
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/files/udev-229-sysmacros.patch | 82 | ||||
| -rw-r--r-- | sys-fs/udev/udev-229-r2.ebuild | 1 |
2 files changed, 83 insertions, 0 deletions
diff --git a/sys-fs/udev/files/udev-229-sysmacros.patch b/sys-fs/udev/files/udev-229-sysmacros.patch new file mode 100644 index 000000000000..d72eb5907da7 --- /dev/null +++ b/sys-fs/udev/files/udev-229-sysmacros.patch @@ -0,0 +1,82 @@ +https://bugs.gentoo.org/580200 +https://github.com/systemd/systemd/commit/27d13af71c3af6b2f9b60556d2c046dbb6e36e23 + +From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 14 Mar 2016 17:44:49 -0400 +Subject: [PATCH] include sys/sysmacros.h in more places + +Since glibc is moving away from implicitly including sys/sysmacros.h +all the time via sys/types.h, include the header directly in more +places. This seems to cover most makedev/major/minor usage. +--- + src/basic/macro.h | 1 + + src/basic/util.h | 1 + + src/libudev/libudev.h | 1 + + src/systemd/sd-device.h | 1 + + src/udev/udev.h | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/src/basic/macro.h b/src/basic/macro.h +index c34441d..b36a956 100644 +--- a/src/basic/macro.h ++++ b/src/basic/macro.h +@@ -23,6 +23,7 @@ + #include <inttypes.h> + #include <stdbool.h> + #include <sys/param.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + + #define _printf_(a,b) __attribute__ ((format (printf, a, b))) +diff --git a/src/basic/util.h b/src/basic/util.h +index e095254..286db05 100644 +--- a/src/basic/util.h ++++ b/src/basic/util.h +@@ -36,6 +36,7 @@ + #include <sys/socket.h> + #include <sys/stat.h> + #include <sys/statfs.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <time.h> + #include <unistd.h> +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index eb58740..3f6d0ed 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -21,6 +21,7 @@ + #define _LIBUDEV_H_ + + #include <stdarg.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + + #ifdef __cplusplus +diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h +index 5bfca6e..c1d0756 100644 +--- a/src/systemd/sd-device.h ++++ b/src/systemd/sd-device.h +@@ -22,6 +22,7 @@ + ***/ + + #include <inttypes.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + + #include "_sd-common.h" +diff --git a/src/udev/udev.h b/src/udev/udev.h +index 5659051..8433e8d 100644 +--- a/src/udev/udev.h ++++ b/src/udev/udev.h +@@ -19,6 +19,7 @@ + */ + + #include <sys/param.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + + #include "libudev.h" +-- +2.7.4 + diff --git a/sys-fs/udev/udev-229-r2.ebuild b/sys-fs/udev/udev-229-r2.ebuild index a228a7288806..959917877d38 100644 --- a/sys-fs/udev/udev-229-r2.ebuild +++ b/sys-fs/udev/udev-229-r2.ebuild @@ -114,6 +114,7 @@ src_prepare() { if [[ -n "${patchset}" ]]; then EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch fi + epatch "${FILESDIR}"/${PN}-229-sysmacros.patch #580200 cat <<-EOF > "${T}"/40-gentoo.rules # Gentoo specific floppy and usb groups |