diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2005-06-30 10:18:45 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2005-06-30 10:18:45 +0000 |
| commit | 0fc10ba6109cd68fe411e459d5053c2ea0bc1526 (patch) | |
| tree | 9fda3955ff291db86df1edb64289bc975f78d910 | |
| parent | force -j1 for avoid breakages, a better fix will follow, hopefully (diff) | |
| download | gentoo-2-0fc10ba6109cd68fe411e459d5053c2ea0bc1526.tar.gz gentoo-2-0fc10ba6109cd68fe411e459d5053c2ea0bc1526.tar.bz2 gentoo-2-0fc10ba6109cd68fe411e459d5053c2ea0bc1526.zip | |
Proper fix
(Portage version: 2.0.51.22-r1)
| -rw-r--r-- | sys-apps/man/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/man/files/man-1.6-parallel-make.patch | 31 | ||||
| -rw-r--r-- | sys-apps/man/man-1.6.ebuild | 7 |
3 files changed, 39 insertions, 5 deletions
diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog index f28473d4205f..934ec83d0850 100644 --- a/sys-apps/man/ChangeLog +++ b/sys-apps/man/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/man # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.68 2005/06/30 09:50:53 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.69 2005/06/30 10:18:45 lu_zero Exp $ + + 30 Jun 2005; Luca Barbato <lu_zero@gentoo.org> + +files/man-1.6-parallel-make.patch, man-1.6.ebuild: + Proper fix by Octavio Ruiz (Ta^3) <tacvbo@tacvbo.net> fixes bug #97439 30 Jun 2005; Luca Barbato <lu_zero@gentoo.org> man-1.6.ebuild: Forced -j1 in the ebuild diff --git a/sys-apps/man/files/man-1.6-parallel-make.patch b/sys-apps/man/files/man-1.6-parallel-make.patch new file mode 100644 index 000000000000..dbf8c8e82bff --- /dev/null +++ b/sys-apps/man/files/man-1.6-parallel-make.patch @@ -0,0 +1,31 @@ +diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in +--- man-1.6.orig/Makefile.in 2005-06-30 04:38:50.000000000 -0500 ++++ man-1.6/Makefile.in 2005-06-30 04:39:21.000000000 -0500 +@@ -33,13 +33,13 @@ + source: src/Makefile + cd src; $(MAKE) + +-manhtml: man2html/Makefile ++manhtml: man2html/Makefile source + cd man2html; $(MAKE) + + manpages: man/Makefile + cd man; $(MAKE) subdirs + +-%messages: gencat/gencat msgs/Makefile ++%messages: gencat/gencat msgs/Makefile source + % cd msgs; $(MAKE) + + %gencat/gencat: +diff -ur man-1.6.orig/src/Makefile.in man-1.6/src/Makefile.in +--- man-1.6.orig/src/Makefile.in 2005-06-30 04:38:50.000000000 -0500 ++++ man-1.6/src/Makefile.in 2005-06-30 04:39:21.000000000 -0500 +@@ -56,7 +56,7 @@ + different.o man-config.o man-getopt.o man.o manpath.o: man-config.h + gripes.o man-config.o man-getopt.o man.o manpath.o util.o: man.h + man-getopt.o man.o manpath.o: man-getopt.h +-man.o manfile.o to_cat.o: manfile.h ++man.o manfile.o to_cat.o: manfile.h gripes.h gripedefs.h + man.o man-iconv.o: man-iconv.h + man.o manpath.o: manpath.h + man-config.o: paths.h diff --git a/sys-apps/man/man-1.6.ebuild b/sys-apps/man/man-1.6.ebuild index c7141bec8a49..678538c20282 100644 --- a/sys-apps/man/man-1.6.ebuild +++ b/sys-apps/man/man-1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6.ebuild,v 1.2 2005/06/30 09:50:53 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6.ebuild,v 1.3 2005/06/30 10:18:45 lu_zero Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -23,7 +23,7 @@ src_unpack() { cd "${S}" # Make sure we can build with -j :) - epatch ${FILESDIR}/man-1.5p-parallel-make.patch + epatch ${FILESDIR}/man-1.6-parallel-make.patch # Fix search order in man.conf so that system installed manpages # will be found first ... @@ -54,8 +54,7 @@ src_compile() { +sgid +fhs \ ${myconf} || die "configure failed" - #Ugly workaround - emake -j1 || die "emake failed" + emake || die "emake failed" } src_install() { |