net-dialup/linux-atm: tweak for linux-headers-5.2

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich
2019-07-20 12:45:09 +01:00
parent 2c146a8125
commit 408621819a
2 changed files with 42 additions and 0 deletions

View File

@@ -0,0 +1,41 @@
Fix build failure against linux-5.2+:
https://www.spinics.net/lists/linux-sh/msg53430.html
--- a/src/maint/atmdump.c
+++ b/src/maint/atmdump.c
@@ -17,6 +17,16 @@
#include <netinet/in.h> /* for htonl and ntohl */
#include <atm.h>
+#ifndef SIOCGSTAMP
+/* linux-5.2+ added support for 64-bit time_t into ioctls
+ that support 'struct timeval' and removed 'SIOCGSTAMP'
+ define.
+
+ Include 'SIOCGSTAMP' wrapper via linux/sockios.h
+ if does not exist.
+ */
+# include <linux/sockios.h>
+#endif
static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE",
"Data SDU 1, CE","Segment OAM F5","End-to-end OAM F5","Reserved (RM)",
--- a/src/maint/saaldump.c
+++ b/src/maint/saaldump.c
@@ -24,6 +24,16 @@
#define MAX_ITEM 2048 /* longest string emitted by q.dump */
+#ifndef SIOCGSTAMP
+/* linux-5.2+ added support for 64-bit time_t into ioctls
+ that support 'struct timeval' and removed 'SIOCGSTAMP'
+ define.
+
+ Include 'SIOCGSTAMP' wrapper via linux/sockios.h
+ if does not exist.
+ */
+# include <linux/sockios.h>
+#endif
static int interval = 0; /* display absolute time by default */
static int quiet = 0; /* decode Q.2931 messages by default */

View File

@@ -25,6 +25,7 @@ CONFIG_CHECK="~ATM"
src_prepare() {
epatch "${FILESDIR}"/${P}-headers.patch
epatch "${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
sed -i '/#define _LINUX_NETDEVICE_H/d' \
src/arpd/*.c || die "sed command on arpd/*.c files failed"