summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-15 18:23:05 +0000
committerMike Frysinger <vapier@gentoo.org>2010-10-15 18:23:05 +0000
commitd0280fc5ec24f1285e59e6d68808fd6c3c3942c2 (patch)
treeda66ff12e67164d148e63066090a403f50e54d42 /sys-apps/makedev
parentAdd missing blocker for upgrade path (diff)
downloadgentoo-2-d0280fc5ec24f1285e59e6d68808fd6c3c3942c2.tar.gz
gentoo-2-d0280fc5ec24f1285e59e6d68808fd6c3c3942c2.tar.bz2
gentoo-2-d0280fc5ec24f1285e59e6d68808fd6c3c3942c2.zip
Fix building with newer glibc #339674 by Ruediger Kramolisch.
(Portage version: 2.2_rc96/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/makedev')
-rw-r--r--sys-apps/makedev/ChangeLog8
-rw-r--r--sys-apps/makedev/files/makedev-3.23.1-headers.patch12
-rw-r--r--sys-apps/makedev/makedev-3.23.1.ebuild12
3 files changed, 27 insertions, 5 deletions
diff --git a/sys-apps/makedev/ChangeLog b/sys-apps/makedev/ChangeLog
index 990fd046dae1..f86c1eea7bc1 100644
--- a/sys-apps/makedev/ChangeLog
+++ b/sys-apps/makedev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/makedev
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/makedev/ChangeLog,v 1.2 2007/08/07 14:51:37 uberlord Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/makedev/ChangeLog,v 1.3 2010/10/15 18:23:05 vapier Exp $
+
+ 15 Oct 2010; Mike Frysinger <vapier@gentoo.org> makedev-3.23.1.ebuild,
+ +files/makedev-3.23.1-headers.patch:
+ Fix building with newer glibc #339674 by Ruediger Kramolisch.
07 Aug 2007; Roy Marples <uberlord@gentoo.org> makedev-3.23.1.ebuild:
Block on <baselayout-2, #187766 thanks to Jakub Moc
diff --git a/sys-apps/makedev/files/makedev-3.23.1-headers.patch b/sys-apps/makedev/files/makedev-3.23.1-headers.patch
new file mode 100644
index 000000000000..fac3fb1b711c
--- /dev/null
+++ b/sys-apps/makedev/files/makedev-3.23.1-headers.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/339674
+
+--- a/MAKEDEV-3.23/sel.h
++++ b/MAKEDEV-3.23/sel.h
+@@ -18,6 +18,7 @@
+ */
+
+ #ifdef MAKEDEV_SELINUX
++#include <limits.h>
+ #include <selinux/selinux.h>
+ static char secontextname[PATH_MAX + 2];
+ static char secontextflag[PATH_MAX + 7];
diff --git a/sys-apps/makedev/makedev-3.23.1.ebuild b/sys-apps/makedev/makedev-3.23.1.ebuild
index a8f5f78eb95e..8f1141cab63c 100644
--- a/sys-apps/makedev/makedev-3.23.1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/makedev/makedev-3.23.1.ebuild,v 1.4 2007/08/07 14:51:37 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/makedev/makedev-3.23.1.ebuild,v 1.5 2010/10/15 18:23:05 vapier Exp $
-inherit toolchain-funcs
+EAPI="2"
+
+inherit eutils toolchain-funcs
MY_PN="MAKEDEV"
MY_VER=${PV%.*}
@@ -22,6 +24,10 @@ DEPEND=""
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-headers.patch #339674
+}
+
src_compile() {
use selinux && export SELINUX=1
emake CC=$(tc-getCC) OPTFLAGS="${CFLAGS}" || die