Skip to content

Commit

Permalink
sys-auth/elogind: Fix build w/ sys-libs/glibc-2.26
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.16, Repoman-2.3.6
  • Loading branch information
a17r committed Dec 4, 2017
1 parent dd18ea8 commit 6b3046a
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sys-auth/elogind/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DIST elogind-233.7.tar.gz 957308 SHA256 8854f29a53d1305dc1c264635b1e970cfcbcc32507af8ef35de4a9b447f79e0b SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78 WHIRLPOOL 597f43c47ff630ec408f99c3d7e88622fc179f542772d800af09691734882bede81ab2d54ea51de21de08be568500477e2688579f9d244ddc11bd282a6678fce
DIST elogind-233.7.tar.gz 957308 BLAKE2B 65361c349771bdb3e28b417e5f5c180505209f215edce316e8131bdc78cb7a1b56c0285df8aa3fd6998c6ea2c349d9892a4f791b59f9ae245819492783099d61 SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78
DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
5 changes: 4 additions & 1 deletion sys-auth/elogind/elogind-233.7-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ PDEPEND="
policykit? ( sys-auth/polkit )
"

PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" )
PATCHES=(
"${FILESDIR}/${PN}-226.4-docs.patch"
"${FILESDIR}/${P}-xlocale.h.patch"
)

pkg_setup() {
local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
Expand Down
27 changes: 27 additions & 0 deletions sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 96eb328e90fa272a66b2feb0bfb57c73154dbd9c 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 | 3 ---
1 file changed, 3 deletions(-)

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index cfdb29aba..c38e14d96 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -23,9 +23,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#if defined(__GLIBC__)
-# include <xlocale.h>
-#endif // defined(__GLIBC__)

#include "alloc-util.h"
//#include "extract-word.h"

0 comments on commit 6b3046a

Please sign in to comment.