| 1 |
mpagano 08/11/26 20:56:41 |
| 2 |
|
| 3 |
Modified: ChangeLog linux-docs-2.6.27.7.ebuild |
| 4 |
linux-docs-2.6.26.4.ebuild |
| 5 |
Log: |
| 6 |
sed update and additional parallel make fix. bug #248337 |
| 7 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.21 sys-kernel/linux-docs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/ChangeLog?rev=1.21&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/ChangeLog?rev=1.21&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/ChangeLog?r1=1.20&r2=1.21 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v |
| 19 |
retrieving revision 1.20 |
| 20 |
retrieving revision 1.21 |
| 21 |
diff -u -r1.20 -r1.21 |
| 22 |
--- ChangeLog 26 Nov 2008 20:17:05 -0000 1.20 |
| 23 |
+++ ChangeLog 26 Nov 2008 20:56:41 -0000 1.21 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sys-kernel/linux-docs |
| 26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.20 2008/11/26 20:17:05 mpagano Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.21 2008/11/26 20:56:41 mpagano Exp $ |
| 29 |
+ |
| 30 |
+ 26 Nov 2008; Mike Pagano <mpagano@g.o> linux-docs-2.6.26.4.ebuild, |
| 31 |
+ linux-docs-2.6.27.7.ebuild: |
| 32 |
+ sed update and additional parallel make fix. bug #248337 |
| 33 |
|
| 34 |
26 Nov 2008; Mike Pagano <mpagano@g.o> linux-docs-2.6.27.7.ebuild: |
| 35 |
Removed unneeded cruft. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: linux-docs-2.6.27.7.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- linux-docs-2.6.27.7.ebuild 26 Nov 2008 20:17:05 -0000 1.2 |
| 52 |
+++ linux-docs-2.6.27.7.ebuild 26 Nov 2008 20:56:41 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild,v 1.2 2008/11/26 20:17:05 mpagano Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.27.7.ebuild,v 1.3 2008/11/26 20:56:41 mpagano Exp $ |
| 58 |
|
| 59 |
inherit toolchain-funcs |
| 60 |
|
| 61 |
@@ -32,7 +32,7 @@ |
| 62 |
|
| 63 |
# fix for parallel build as per bug #248337 |
| 64 |
sed -i \ |
| 65 |
- -e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook +\$@:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \ |
| 66 |
+ -e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \ |
| 67 |
"${S}"/Makefile |
| 68 |
} |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.2 sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild?rev=1.2&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild?rev=1.2&content-type=text/plain |
| 77 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild?r1=1.1&r2=1.2 |
| 78 |
|
| 79 |
Index: linux-docs-2.6.26.4.ebuild |
| 80 |
=================================================================== |
| 81 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild,v |
| 82 |
retrieving revision 1.1 |
| 83 |
retrieving revision 1.2 |
| 84 |
diff -u -r1.1 -r1.2 |
| 85 |
--- linux-docs-2.6.26.4.ebuild 8 Sep 2008 13:40:59 -0000 1.1 |
| 86 |
+++ linux-docs-2.6.26.4.ebuild 26 Nov 2008 20:56:41 -0000 1.2 |
| 87 |
@@ -1,6 +1,6 @@ |
| 88 |
# Copyright 1999-2008 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild,v 1.1 2008/09/08 13:40:59 mpagano Exp $ |
| 91 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.26.4.ebuild,v 1.2 2008/11/26 20:56:41 mpagano Exp $ |
| 92 |
|
| 93 |
inherit toolchain-funcs |
| 94 |
|
| 95 |
@@ -29,16 +29,21 @@ |
| 96 |
-e "s:db2:docbook2:g" \ |
| 97 |
-e "s:/usr/local/man:${D}/usr/share/man:g" \ |
| 98 |
"${S}"/Documentation/DocBook/Makefile |
| 99 |
+ |
| 100 |
+ # fix for parallel build as per bug #248337 |
| 101 |
+ sed -i \ |
| 102 |
+ -e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \ |
| 103 |
+ "${S}"/Makefile |
| 104 |
} |
| 105 |
|
| 106 |
src_compile() { |
| 107 |
local ARCH=$(tc-arch-kernel) |
| 108 |
unset KBUILD_OUTPUT |
| 109 |
|
| 110 |
- make mandocs || die "make mandocs failed" |
| 111 |
+ emake mandocs || die "make mandocs failed" |
| 112 |
|
| 113 |
if use html; then |
| 114 |
- make htmldocs || die "make htmldocs failed" |
| 115 |
+ emake htmldocs || die "make htmldocs failed" |
| 116 |
fi |
| 117 |
} |
Archives