diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-04 03:51:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-04 03:51:15 +0000 |
| commit | bb103e7bf47de8debe509d3fada0b9824053457a (patch) | |
| tree | 39e91388bdd991d57681f8a955eb28681d5ddae3 /sys-apps/util-linux | |
| parent | version bump, improved hardened hack^H^H^H^Hhandling (diff) | |
| download | historical-bb103e7bf47de8debe509d3fada0b9824053457a.tar.gz historical-bb103e7bf47de8debe509d3fada0b9824053457a.tar.bz2 historical-bb103e7bf47de8debe509d3fada0b9824053457a.zip | |
Fix parallel building w/setarch man page links #511812 by Thomas D.
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.25-parallel-setarch.patch | 33 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.25.2-r2.ebuild | 3 |
3 files changed, 40 insertions, 2 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index eb4a90cc24cd..86f83c5a8913 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.505 2015/04/23 05:13:56 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.506 2015/05/04 03:51:15 vapier Exp $ + + 04 May 2015; Mike Frysinger <vapier@gentoo.org> util-linux-2.25.2-r2.ebuild, + +files/util-linux-2.25-parallel-setarch.patch: + Fix parallel building w/setarch man page links #511812 by Thomas D. 23 Apr 2015; Jeroen Roovers <jer@gentoo.org> util-linux-2.25.2-r2.ebuild: Stable for PPC64 (bug #536906). diff --git a/sys-apps/util-linux/files/util-linux-2.25-parallel-setarch.patch b/sys-apps/util-linux/files/util-linux-2.25-parallel-setarch.patch new file mode 100644 index 000000000000..e694af548575 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.25-parallel-setarch.patch @@ -0,0 +1,33 @@ +From 762b4d8691c46964dfc0d40dab772191538c807a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@chromium.org> +Date: Sun, 3 May 2015 23:37:04 -0400 +Subject: [PATCH] build-sys: fix parallel builds w/setarch links + +The symlink generation tries to write to the sys-utils/ subdir but does +not make sure that dir exists. This can sometimes lead to parallel build +failures when building out-of-tree like: +... +echo ".so man8/setarch.8" > sys-utils/linux64.8 +/bin/bash: sys-utils/linux64.8: No such file or directory +Makefile:11503: recipe for target 'sys-utils/linux64.8' failed +make: *** [sys-utils/linux64.8] Error 1 + +URL: https://bugs.gentoo.org/511812 +Signed-off-by: Mike Frysinger <vapier@chromium.org> +--- + sys-utils/Makemodule.am | 1 + + 1 file changed, 1 insertion(+) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -10806,6 +10806,7 @@ install-exec-hook: + @BUILD_VIPW_TRUE@ cd $(DESTDIR)$(usrsbin_execdir) && ln -sf vipw vigr + + @BUILD_SETARCH_TRUE@$(SETARCH_MAN_LINKS): ++@BUILD_SETARCH_TRUE@ $(AM_V_at) test -d $(dir $@) || mkdir -p $(dir $@) + @BUILD_SETARCH_TRUE@ $(AM_V_GEN)echo ".so man8/setarch.8" > $@ + + @BUILD_SETARCH_TRUE@install-exec-hook-setarch: +-- +2.4.0 + diff --git a/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild index 1376777e7228..a0e227b9800d 100644 --- a/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild,v 1.13 2015/04/23 05:13:56 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild,v 1.14 2015/05/04 03:51:15 vapier Exp $ EAPI="4" @@ -63,6 +63,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288 + epatch "${FILESDIR}"/${PN}-2.25-parallel-setarch.patch #511812 if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf |