diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-10 07:15:33 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-10 07:15:33 +0000 |
commit | 6cea71df34d28e5caef2f03f4e793fa3f0e12861 (patch) | |
tree | 89a160195507743fd32f0d921dbefb41e1a0db1a /sys-fs | |
parent | Force emake install to -j1 to avoid spurious failures #465352 (diff) | |
download | gentoo-2-6cea71df34d28e5caef2f03f4e793fa3f0e12861.tar.gz gentoo-2-6cea71df34d28e5caef2f03f4e793fa3f0e12861.tar.bz2 gentoo-2-6cea71df34d28e5caef2f03f4e793fa3f0e12861.zip |
Force latest sys-devel/make and drop some parallel make workarounds
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/ChangeLog | 14 | ||||
-rw-r--r-- | sys-fs/udev/udev-201.ebuild | 12 | ||||
-rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 12 |
3 files changed, 17 insertions, 21 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index e47df46fafbb..c347d662efcc 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.901 2013/04/09 11:20:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.902 2013/04/10 07:15:33 ssuominen Exp $ + + 10 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> udev-201.ebuild, + udev-9999.ebuild: + Force >=sys-devel/make-3.82-r4 for eg. -intermediate-parallel.patch as + recommended by upstream. + Remove building of libsystemd-shared.la and libudev-private.la as they + should be getting pulled in as dependencies. *udev-201 (09 Apr 2013) @@ -15,10 +22,7 @@ 04 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> udev-200.ebuild, udev-9999.ebuild: - Build libsystemd-shared.la, libudev-private.la, and libudev.la before the - "helpers" for parallel make wrt #464508 by Sergey Korolev - The pretargets=() in src_compile() function should be considered temporary - solution. + Build libsystemd-shared.la and libudev-private.la first wrt #464508 02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> udev-200.ebuild: Stable for arm, wrt bug #463614 diff --git a/sys-fs/udev/udev-201.ebuild b/sys-fs/udev/udev-201.ebuild index e0d800b6760f..25b053da0d44 100644 --- a/sys-fs/udev/udev-201.ebuild +++ b/sys-fs/udev/udev-201.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-201.ebuild,v 1.1 2013/04/09 11:20:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-201.ebuild,v 1.2 2013/04/10 07:15:33 ssuominen Exp $ EAPI=5 @@ -40,7 +40,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) - kmod? ( >=sys-apps/kmod-12 ) + kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd" @@ -48,6 +48,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20 DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets dev-libs/libxslt + >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-${KV_min} @@ -249,12 +250,8 @@ src_configure() { src_compile() { echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES - local pretargets=( - libsystemd-shared.la - libudev-private.la - libudev.la - ) local targets=( + libudev.la systemd-udevd udevadm ata_id @@ -272,7 +269,6 @@ src_compile() { use keymap && targets+=( keymap ) use gudev && targets+=( libgudev-1.0.la ) - emake "${pretargets[@]}" emake "${targets[@]}" if use doc; then emake -C docs/libudev diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 5ae9e8ed7a21..f14adca6c32b 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.221 2013/04/04 12:53:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.222 2013/04/10 07:15:33 ssuominen Exp $ EAPI=5 @@ -40,7 +40,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) - kmod? ( >=sys-apps/kmod-12 ) + kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd" @@ -48,6 +48,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20 DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets dev-libs/libxslt + >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-${KV_min} @@ -249,12 +250,8 @@ src_configure() { src_compile() { echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES - local pretargets=( - libsystemd-shared.la - libudev-private.la - libudev.la - ) local targets=( + libudev.la systemd-udevd udevadm ata_id @@ -272,7 +269,6 @@ src_compile() { use keymap && targets+=( keymap ) use gudev && targets+=( libgudev-1.0.la ) - emake "${pretargets[@]}" emake "${targets[@]}" if use doc; then emake -C docs/libudev |