diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-09-29 22:58:55 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-09-29 22:58:55 +0000 |
commit | 4ee0997ee506ec70dd5b951163fa7d7ef2df96cb (patch) | |
tree | 84d6d7eef94630166d1caa2f643a06fcaf45a79d /sys-libs | |
parent | Version bump. (diff) | |
download | gentoo-2-4ee0997ee506ec70dd5b951163fa7d7ef2df96cb.tar.gz gentoo-2-4ee0997ee506ec70dd5b951163fa7d7ef2df96cb.tar.bz2 gentoo-2-4ee0997ee506ec70dd5b951163fa7d7ef2df96cb.zip |
Fix by Chris Richards for building with glibc-2.12 #338302.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/libselinux/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/libselinux/files/libselinux-2.0.85-headers.patch | 14 | ||||
-rw-r--r-- | sys-libs/libselinux/libselinux-2.0.85.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog index 85c748bbc9ad..ff02504b5f76 100644 --- a/sys-libs/libselinux/ChangeLog +++ b/sys-libs/libselinux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libselinux # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.65 2010/04/16 19:33:16 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.66 2010/09/29 22:58:55 vapier Exp $ + + 29 Sep 2010; Mike Frysinger <vapier@gentoo.org> libselinux-2.0.85.ebuild, + +files/libselinux-2.0.85-headers.patch: + Fix by Chris Richards for building with glibc-2.12 #338302. 16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> libselinux-2.0.71.ebuild, libselinux-2.0.85.ebuild: diff --git a/sys-libs/libselinux/files/libselinux-2.0.85-headers.patch b/sys-libs/libselinux/files/libselinux-2.0.85-headers.patch new file mode 100644 index 000000000000..4994fea9371e --- /dev/null +++ b/sys-libs/libselinux/files/libselinux-2.0.85-headers.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/338302 + +fix by Chris Richards for building with glibc-2.12 + +--- src/label_file.c ++++ src/label_file.c +@@ -19,6 +19,7 @@ + #include <regex.h> + #include "callbacks.h" + #include "label_internal.h" ++#include <sys/stat.h> + + /* + * Internals, mostly moved over from matchpathcon.c diff --git a/sys-libs/libselinux/libselinux-2.0.85.ebuild b/sys-libs/libselinux/libselinux-2.0.85.ebuild index 323ba4fdfcf8..af3531b21919 100644 --- a/sys-libs/libselinux/libselinux-2.0.85.ebuild +++ b/sys-libs/libselinux/libselinux-2.0.85.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.85.ebuild,v 1.3 2010/04/16 19:33:16 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.85.ebuild,v 1.4 2010/09/29 22:58:55 vapier Exp $ IUSE="ruby" RUBY_OPTIONAL="yes" @@ -30,6 +30,7 @@ src_unpack() { cd "${S}" [ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}" + epatch "${FILESDIR}"/${P}-headers.patch #338302 # fix up paths for multilib sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \ |