From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
Date: Wed, 10 Jan 2018 18:32:24 +0000 (UTC) [thread overview]
Message-ID: <1515609106.e248b7af8903fdb47cd11c203d46f8eded6023c3.floppym@gentoo> (raw)
commit: e248b7af8903fdb47cd11c203d46f8eded6023c3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 18:20:34 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 18:31:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e248b7af
sys-fs/udev: fix 233 build with glibc-2.26
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
sys-fs/udev/files/233-fix-includes.patch | 38 ++++++++++++++++++++++++++++++++
sys-fs/udev/udev-233.ebuild | 3 ++-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/sys-fs/udev/files/233-fix-includes.patch b/sys-fs/udev/files/233-fix-includes.patch
new file mode 100644
index 00000000000..44b06214f89
--- /dev/null
+++ b/sys-fs/udev/files/233-fix-includes.patch
@@ -0,0 +1,38 @@
+From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001
+From: Matija Skala <mskala@gmx.com>
+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"
+
diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index c42ecc2c0be..33ba3ae76f4 100644
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -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
@@ -57,6 +57,7 @@ S=${WORKDIR}/systemd-${PV}
PATCHES=(
"${FILESDIR}"/233-format-warnings.patch
+ "${FILESDIR}"/233-fix-includes.patch
)
check_default_rules() {
next reply other threads:[~2018-01-10 18:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 18:32 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-25 0:02 [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/ Mike Gilbert
2021-08-03 11:27 David Seifert
2021-01-06 15:47 Mike Gilbert
2019-10-11 4:38 William Hubbs
2019-07-30 14:46 Mike Gilbert
2017-12-16 17:54 William Hubbs
2017-08-13 23:08 Mike Gilbert
2017-07-02 16:11 Mike Gilbert
2017-01-16 16:37 Mike Gilbert
2016-11-05 14:13 Lars Wendler
2016-04-20 3:17 Mike Frysinger
2016-03-09 16:45 William Hubbs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515609106.e248b7af8903fdb47cd11c203d46f8eded6023c3.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox