Skip to content

Commit

Permalink
sys-fs/udev: fix 233 build with glibc-2.26
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
  • Loading branch information
floppym committed Jan 10, 2018
1 parent 4e037e6 commit e248b7a
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
38 changes: 38 additions & 0 deletions sys-fs/udev/files/233-fix-includes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001
From: Matija Skala <[email protected]>
Date: Wed, 15 Mar 2017 13:21:10 +0100
Subject: [PATCH] fix includes

linux/sockios.h is needed for the SIOCGSTAMPNS macro

xlocale.h is included indirectly in glibc and doesn't even exist in
other libcs
---
src/basic/parse-util.c | 1 -
src/libsystemd-network/sd-lldp.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 6e58ced6f5..d86700736d 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <xlocale.h>

#include "alloc-util.h"
#include "extract-word.h"
diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c
index 0702241506..39ddb2461a 100644
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp.c
@@ -19,6 +19,7 @@
***/

#include <arpa/inet.h>
+#include <linux/sockios.h>

#include "sd-lldp.h"

3 changes: 2 additions & 1 deletion sys-fs/udev/udev-233.ebuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=6
Expand Down Expand Up @@ -57,6 +57,7 @@ S=${WORKDIR}/systemd-${PV}

PATCHES=(
"${FILESDIR}"/233-format-warnings.patch
"${FILESDIR}"/233-fix-includes.patch
)

check_default_rules() {
Expand Down

0 comments on commit e248b7a

Please sign in to comment.