summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-09-03 10:52:23 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-09-03 10:52:23 +0000
commitcb5b3873e5fca6c016619cddc97f84c826c1e52c (patch)
tree1af7bb7c96cf41161e225014869f4640716ba5c0 /sys-fs
parentReplace some sed scripts with a patch. Do not inject pkg-config output direct... (diff)
downloadgentoo-2-cb5b3873e5fca6c016619cddc97f84c826c1e52c.tar.gz
gentoo-2-cb5b3873e5fca6c016619cddc97f84c826c1e52c.tar.bz2
gentoo-2-cb5b3873e5fca6c016619cddc97f84c826c1e52c.zip
Fix linking problem in bug #520684
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/eudev/ChangeLog8
-rw-r--r--sys-fs/eudev/eudev-1.10-r1.ebuild (renamed from sys-fs/eudev/eudev-1.10.ebuild)3
-rw-r--r--sys-fs/eudev/files/eudev-fix-selinux-linking.patch30
3 files changed, 39 insertions, 2 deletions
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 18bafa19ba34..da575f769c7a 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/eudev
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.136 2014/09/02 22:34:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.137 2014/09/03 10:52:23 blueness Exp $
+
+*eudev-1.10-r1 (03 Sep 2014)
+
+ 03 Sep 2014; Anthony G. Basile <blueness@gentoo.org> +eudev-1.10-r1.ebuild,
+ +files/eudev-fix-selinux-linking.patch, -eudev-1.10.ebuild:
+ Fix linking problem in bug #520684
02 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+files/eudev-fix-selinux-headers.patch, eudev-1.10.ebuild:
diff --git a/sys-fs/eudev/eudev-1.10.ebuild b/sys-fs/eudev/eudev-1.10-r1.ebuild
index 63d9106363c1..d9bd2b726849 100644
--- a/sys-fs/eudev/eudev-1.10.ebuild
+++ b/sys-fs/eudev/eudev-1.10-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.10.ebuild,v 1.2 2014/09/02 22:34:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.10-r1.ebuild,v 1.1 2014/09/03 10:52:23 blueness Exp $
EAPI="5"
@@ -106,6 +106,7 @@ src_prepare() {
# Bug #520684
epatch "${FILESDIR}"/${PN}-fix-selinux-headers.patch
+ epatch "${FILESDIR}"/${PN}-fix-selinux-linking.patch
epatch_user
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch
new file mode 100644
index 000000000000..6a5e05bcaf1e
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch
@@ -0,0 +1,30 @@
+From e7f7217b9b9dbb3304116eae2b0ad90c84ede034 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Wed, 3 Sep 2014 11:01:31 +0200
+Subject: [PATCH] link libudev against SELINUX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
+---
+ src/libudev/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am
+index 868a9fc..72e43bc 100644
+--- a/src/libudev/Makefile.am
++++ b/src/libudev/Makefile.am
+@@ -54,7 +54,8 @@ libudev_la_LDFLAGS = \
+ -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
+
+ libudev_la_LIBADD = \
+- $(top_builddir)/src/shared/libudev_shared.la
++ $(top_builddir)/src/shared/libudev_shared.la \
++ $(SELINUX_LIBS)
+
+ libudev_private_la_SOURCES = \
+ $(libudev_la_SOURCES) \
+--
+2.1.0
+