diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-05-04 07:05:24 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-05-04 07:05:24 +0000 |
| commit | af5524efd0ef2c87d980aad7f57e99cdc908e7b6 (patch) | |
| tree | 7e9aae3094b52d4e59ba4f821d0150cfd348b333 /sys-fs | |
| parent | Version bump (diff) | |
| download | gentoo-2-af5524efd0ef2c87d980aad7f57e99cdc908e7b6.tar.gz gentoo-2-af5524efd0ef2c87d980aad7f57e99cdc908e7b6.tar.bz2 gentoo-2-af5524efd0ef2c87d980aad7f57e99cdc908e7b6.zip | |
Fix parallel make issue, Bug #176918. Added forgotten backslash causing udev to fail on selinux, Bug #176957.
(Portage version: 2.1.2.5)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-110-makefile-depend.diff | 13 | ||||
| -rw-r--r-- | sys-fs/udev/udev-110.ebuild | 6 |
3 files changed, 23 insertions, 3 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 3a242e4a0f37..0aae4b7c76c6 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.299 2007/05/03 14:43:37 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.300 2007/05/04 07:05:24 zzam Exp $ + + 04 May 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/udev-110-makefile-depend.diff, udev-110.ebuild: + Fix parallel make issue, Bug #176918. Added forgotten backslash causing udev + to fail on selinux, Bug #176957. 03 May 2007; Matthias Schwarzott <zzam@gentoo.org> files/udev-start-110.sh: diff --git a/sys-fs/udev/files/udev-110-makefile-depend.diff b/sys-fs/udev/files/udev-110-makefile-depend.diff new file mode 100644 index 000000000000..8b7cb295f07e --- /dev/null +++ b/sys-fs/udev/files/udev-110-makefile-depend.diff @@ -0,0 +1,13 @@ +diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile +index fafcc52..5618b96 100644 +--- a/extras/volume_id/lib/Makefile ++++ b/extras/volume_id/lib/Makefile +@@ -69,7 +69,7 @@ all: libvolume_id.a $(SHLIB) libvolume_id.pc + .shlib: + $(Q) mkdir .shlib + +-.shlib/%.o: %.c ++.shlib/%.o: %.c .shlib + $(E) " CC " $@ + $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@ + diff --git a/sys-fs/udev/udev-110.ebuild b/sys-fs/udev/udev-110.ebuild index 77fb8c3e06b8..884018c7e562 100644 --- a/sys-fs/udev/udev-110.ebuild +++ b/sys-fs/udev/udev-110.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-110.ebuild,v 1.1 2007/05/02 13:53:25 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-110.ebuild,v 1.2 2007/05/04 07:05:24 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -29,6 +29,8 @@ src_unpack() { #epatch ${FILESDIR}/${P}-udev_volume_id.patch epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch + epatch ${FILESDIR}/${P}-makefile-depend.diff + # No need to clutter the logs ... sed -ie '/^DEBUG/ c\DEBUG = false' Makefile # Do not use optimization flags from the package @@ -71,7 +73,7 @@ src_compile() { EXTRAS="${extras}" \ udevdir="/dev/" \ CROSS_COMPILE=${mycross} \ - OPTFLAGS="" + OPTFLAGS="" \ ${myconf} || die } |