diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-04-01 10:42:49 +1030 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-04-01 10:43:00 +1030 |
| commit | b5542e1abd3d92012a384b3676eceea7248a4569 (patch) | |
| tree | a496c29803d874fdb2ea3de1bea3188758e3f94c /package/owfs/0001-include-sys-sysmacros.h-for-major.patch | |
| parent | 4ffa9554af5462c2db90300c7597cb6fa51f2d8f (diff) | |
| parent | 863761ff3c6233e6e2ef836c4600590dc0d38197 (diff) | |
| download | buildroot-b5542e1abd3d92012a384b3676eceea7248a4569.tar.gz buildroot-b5542e1abd3d92012a384b3676eceea7248a4569.zip | |
Merge tag '2019.02.1' into 2019.02-op-build
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'package/owfs/0001-include-sys-sysmacros.h-for-major.patch')
| -rw-r--r-- | package/owfs/0001-include-sys-sysmacros.h-for-major.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/owfs/0001-include-sys-sysmacros.h-for-major.patch b/package/owfs/0001-include-sys-sysmacros.h-for-major.patch new file mode 100644 index 0000000000..dadf0276cd --- /dev/null +++ b/package/owfs/0001-include-sys-sysmacros.h-for-major.patch @@ -0,0 +1,50 @@ +From 0d5e4ba51d2b90a64f5d310d715ed367bbcc8996 Mon Sep 17 00:00:00 2001 +From: Tomasz Torcz <tomek@pipebreaker.pl> +Date: Sat, 17 Mar 2018 12:56:04 +0100 +Subject: [PATCH] include <sys/sysmacros.h> for major() + + Linux glibc ceased to include it in sys/types.h: +https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: commit 0d5e4ba51d2 + + configure.ac | 2 +- + module/owlib/src/include/ow.h | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86751bf7cff7..d625d3f02b48 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4]) + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +-AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) ++AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) + AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h]) + AC_CHECK_HEADERS(sys/event.h sys/inotify.h) + +diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h +index 9dbec5f31cf7..0a31055238b1 100644 +--- a/module/owlib/src/include/ow.h ++++ b/module/owlib/src/include/ow.h +@@ -188,8 +188,12 @@ + #include <netdb.h> /* for getaddrinfo */ + #endif /* HAVE_NETDB_H */ + ++#ifdef HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> /* for major() */ ++#endif /* HAVE_SYS_SYSMACROS_H */ ++ + #ifdef HAVE_SYS_MKDEV_H +-#include <sys/mkdev.h> /* for major() */ ++#include <sys/mkdev.h> /* for major() on Solaris */ + #endif /* HAVE_SYS_MKDEV_H */ + + #include <stddef.h> // for offsetof() +-- +2.18.0 + |
