Give submake a jobserver.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 289 insertions, 2 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 5055c3553b27..6e44e4862e46 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.57 2010/07/19 23:57:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.58 2010/07/20 00:06:41 jer Exp $
+
+*lilo-23.0-r1 (20 Jul 2010)
+
+  20 Jul 2010; Jeroen Roovers <jer@gentoo.org> +lilo-23.0-r1.ebuild,
+  +files/lilo-23.0-make.patch:
+  Give submake a jobserver.
 
   19 Jul 2010; Jeroen Roovers <jer@gentoo.org> lilo-23.0.ebuild:
   Strip only the lilo binary thanks to Vladimir and Krzysztof Olędzki (bug
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 238b37ee22fb..07aaa66ba0c1 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -2,11 +2,13 @@ AUX lilo-22.8-correct-usage-info.patch 604 RMD160 d7cd1c5521c58ba19b1e0847746b5f
 AUX lilo-22.8-makefile.patch 1776 RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddfff SHA1 346d53bb307d1baa393da1db1fc516b1cc5ebee7 SHA256 4e95ead9648613a4682445f161818e6af875386aaa24f33bdb87c4c3d7cf38d7
 AUX lilo-22.8-nodevmapper.patch 437 RMD160 1c70c8d9b107f0210cbc90e6c005d0a079de040c SHA1 fa6cae8448c13bd10c68a4ee79bb753f2f8ec4aa SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6
 AUX lilo-22.8-novga.patch 831 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 SHA1 6b17310e2c71c605a7a2e816ac2a02b326ee6d28 SHA256 5ff92c00ce2624a070ebb616ab2efede5460cdd229d0e9bc97e4ddc65daa1e8a
+AUX lilo-23.0-make.patch 2148 RMD160 197ebfa2bdd6543dc26dd7f2d80fcc88c7f38be7 SHA1 f1e7bef7ec5a0c7683b6f89139f2b19ec3a64dcf SHA256 21f0608cdf3e701478596d25bf1ebd1617fc7c3fcc97205ed39b8608cd203073
 AUX lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b SHA1 75c7374359acb94955026a1f626c5355d70829cd SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0
 DIST dolilo-0.5.tar.bz2 3777 RMD160 10a060878ee3fc50ba109c8d2decdd6b409bed2e SHA1 9617479e3736c24d3c06628c540a5eaeb184d849 SHA256 9b6994ec6416cdfb0205665a58dc2e6a1d6e36272a3cab94315daea1c55605f1
 DIST lilo-22.8.src.tar.gz 437555 RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 SHA1 59852eab59b93dcea63b39eef1db7963b7268b0d SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb
 DIST lilo-23.0.tar.gz 449621 RMD160 c2c63aeaa810a95f8bdade857e0881c97a7d07f2 SHA1 2465f359f1c298d9bbf17843127cffc14e352e39 SHA256 2c180ea2947e2e7f18afba93a5f2bfed2f28c1604445c663820195ae42e55910
 EBUILD lilo-22.8-r2.ebuild 4676 RMD160 ecc77fbc276cc2ecda9096bf45391ef05a972e9f SHA1 11b4217c77432cc47de7fe83bd2d987e2457157a SHA256 de983ed421a87c33d77779ddaeb4d510c03ed0e778b99ee2af8e3434d576fb5b
+EBUILD lilo-23.0-r1.ebuild 4250 RMD160 70f0e684cff3465a97a335afa968d00410b0499f SHA1 8c1fb28539aa342a678317976bd24d7ce305f108 SHA256 0a8957381242d4d66f9fd65a38cfa9e340ad065f4f33afff0967cf93346d6c5f
 EBUILD lilo-23.0.ebuild 4186 RMD160 c02bfd4c0867f9769c87a5ad02ef4c002bc8cb28 SHA1 f6439198b5db374e6c86a589da4b7ae826aba387 SHA256 ee771e91be43ac1af552fb79d5a203d59985c02e3545d71906d334d16c7a27b0
-MISC ChangeLog 10860 RMD160 ef770a1cc50e23c3f95138ca70376d42ee27f1bf SHA1 a32ca93aefe6c233db44b5b2a64426a7f9ec308e SHA256 bbfd2f8afe207c404a5c771063422ca300001fd3d4247a61d912bf52402dbe06
+MISC ChangeLog 11018 RMD160 16c014f499ba3fd2ca6f35877a264101778b8589 SHA1 3402a1897ac063c7a5df55e5008a5f3742cd64e6 SHA256 e2bdab455a6ae0974c4062e2727ab3f44f8b5ffa8d314cf56674431d14e39eb5
 MISC metadata.xml 522 RMD160 9c4f3c0f6aceed93fa4fe295784994fa2a48e5e2 SHA1 2c2a255573c6431b3198748cb8fc51b6d5608704 SHA256 52f357c0a361c837bf7b569033bd44667f2c32a857bf7ec64dabfb34bb4d5026
diff --git a/sys-boot/lilo/files/lilo-23.0-make.patch b/sys-boot/lilo/files/lilo-23.0-make.patch
new file mode 100644
index 000000000000..39bc514dd61b
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-23.0-make.patch
@@ -0,0 +1,103 @@
+--- Makefile.orig	2010-06-18 19:17:48.000000000 +0200
++++ Makefile	2010-07-20 02:00:18.000000000 +0200
+@@ -26,19 +26,19 @@
+ # everything needed to run, just short of installation
+ #
+ all: test
+-	make -C src all
++	$(MAKE) -C src all
+ 
+ #
+ # everything above plus the statically linked version
+ #
+ alles: test
+-	make -C src alles
++	$(MAKE) -C src alles
+ 
+ #
+ # documentation files
+ #
+ docs:
+-	make -C doc all
++	$(MAKE) -C doc all
+ 
+ #
+ # if you have the 'bcc' compiler, then you can make the diagnostics, too
+@@ -55,23 +55,23 @@
+ 	@echo before you proceed from this point.
+ 	@echo "Press <Enter> to continue, <^C> to abort ..."
+ 	@read
+-	@make -C src floppy1
++	@$(MAKE) -C src floppy1
+ 	@echo Done.
+ 	@echo
+ 	@echo Remove the floppy from the drive.  Label it "\"1.6\""
+ 	@echo "Press <Enter> to continue, <^C> to abort ..."
+ 	@read
+-	@make -C src floppy2
++	@$(MAKE) -C src floppy2
+ 	@echo Done.
+ 	@echo
+ 	@echo Remove the floppy from the drive.  Label it "\"2.4\""
+ 	@echo
+ 
+ diagnostic: test
+-	make -C src diagnostic
++	$(MAKE) -C src diagnostic
+ 
+ dosexe: test
+-	make -C dos lilo
++	$(MAKE) -C dos lilo
+ 
+ #
+ # test for compilers & utilities
+@@ -85,33 +85,33 @@
+ # shorthand install, if one knows that one has the 'bcc' compiler
+ #
+ ins:
+-	make -C src ins
++	$(MAKE) -C src ins
+ 
+ #
+ #  normal install, but doesn't make the diagnostic binaries
+ #
+ install:  all
+-	make -C src install
+-	make -C man install
+-	make -C dos install
+-	make -C src insobs
++	$(MAKE) -C src install
++	$(MAKE) -C man install
++	$(MAKE) -C dos install
++	$(MAKE) -C src insobs
+ 
+ tidy:
+-	make -C src tidy
+-	make -C diagnose tidy
+-	make -C dos tidy
+-	make -C doc tidy
++	$(MAKE) -C src tidy
++	$(MAKE) -C diagnose tidy
++	$(MAKE) -C dos tidy
++	$(MAKE) -C doc tidy
+ 
+ clean: tidy
+ 	rm -f test.img
+-	make -C src clean
+-	make -C diagnose clean
+-	make -C dos clean
++	$(MAKE) -C src clean
++	$(MAKE) -C diagnose clean
++	$(MAKE) -C dos clean
+ 
+ spotless: distclean
+ distclean: clean
+-	make -C src distclean
+-	make -C diagnose distclean
+-	make -C dos distclean
+-	make -C doc clean
++	$(MAKE) -C src distclean
++	$(MAKE) -C diagnose distclean
++	$(MAKE) -C dos distclean
++	$(MAKE) -C doc clean
+ 
diff --git a/sys-boot/lilo/lilo-23.0-r1.ebuild b/sys-boot/lilo/lilo-23.0-r1.ebuild
new file mode 100644
index 000000000000..0298c283498b
--- /dev/null
+++ b/sys-boot/lilo/lilo-23.0-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.0-r1.ebuild,v 1.1 2010/07/20 00:06:41 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DOLILO_V="0.5"
+IUSE="static minimal pxeserial device-mapper"
+
+DESCRIPTION="Standard Linux boot loader"
+HOMEPAGE="https://alioth.debian.org/projects/lilo/"
+DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
+
+SRC_URI="
+	https://alioth.debian.org/frs/download.php/3315/${P}.tar.gz
+	mirror://gentoo/${DOLILO_TAR}
+"
+
+SLOT="0"
+LICENSE="BSD GPL-2"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=">=sys-devel/bin86-0.15.5"
+RDEPEND="device-mapper? ( || (
+	>=sys-fs/lvm2-2.02.45
+	>=sys-fs/device-mapper-1.02.12 ) )"
+
+PROVIDE="virtual/bootloader"
+
+src_prepare() {
+	# this patch is needed when booting PXE and the device you're using
+	# emulates vga console via serial console.
+	# IE..  B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping.
+	use pxeserial && epatch "${FILESDIR}/${PN}-22.8-novga.patch"
+
+	# Have parallel make
+	epatch "${FILESDIR}/${P}-make.patch"
+
+	# Do not strip
+	sed -i src/Makefile -e '/strip/d' || die "sed strip failed"
+}
+
+src_compile() {
+	# lilo needs this. bug #140209
+	export LC_ALL=C
+
+	# hardened automatic PIC plus PIE building should be suppressed
+	# because of assembler instructions that cannot be compiled PIC
+	HARDENED_CFLAGS="`test-flags-CC -fno-pic -nopie`"
+
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	if use static; then
+		emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" alles || die
+	else
+		emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" all || die
+	fi
+}
+
+src_install() {
+	keepdir /boot
+	emake DESTDIR="${D}" install || die
+
+	if use !minimal; then
+		into /
+		dosbin "${WORKDIR}"/dolilo/dolilo || die
+
+		into /usr
+		dosbin keytab-lilo.pl || die
+
+		insinto /etc
+		newins "${FILESDIR}"/lilo.conf lilo.conf.example || die
+
+		newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die
+
+		doman manPages/*.[5-8]
+		dodoc CHANGELOG* readme/README.* readme/INCOMPAT README
+		docinto samples ; dodoc sample/*
+	fi
+}
+
+# Check whether LILO is installed
+# This function is from /usr/sbin/mkboot from debianutils, with copyright:
+#
+#   Debian GNU/Linux
+#   Copyright 1996-1997 Guy Maor <maor@debian.org>
+#
+# Modified for Gentoo for use with the lilo ebuild by:
+#   Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003)
+#
+lilocheck() {
+	local bootpart=
+	local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
+
+	echo
+	einfon "Checking for LILO ..."
+
+	if [ "$(whoami)" != "root" ]
+	then
+		echo; echo
+		eerror "Only root can check for LILO!"
+		return 1
+	fi
+
+	if [ -z "${rootpart}" ]
+	then
+		echo; echo
+		eerror "Could not determine root partition!"
+		return 1
+	fi
+
+	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
+	then
+		echo " No"
+		return 1
+	fi
+
+	bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)"
+
+	if [ -z "${bootpart}" ]
+	then
+		# lilo defaults to current root when 'boot=' is not present
+		bootpart="${rootpart}"
+	fi
+
+	if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
+	then
+		echo; echo
+		ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
+		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
+		return 1
+	fi
+
+	echo " Yes, on ${bootpart}"
+
+	return 0
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}/boot/boot.b" -a ! -L "${ROOT}/boot/boot.b" ]
+	then
+		[ -f "${ROOT}/boot/boot-menu.b" ] && \
+			ln -snf boot-menu.b "${ROOT}/boot/boot.b"
+	fi
+
+	if [ "${ROOT}" = "/" ] && use !minimal;
+	then
+		if lilocheck
+		then
+			einfo "Running DOLILO to complete the install ..."
+			# do not redirect to /dev/null because it may display some input
+			# prompt
+			/sbin/dolilo
+			if [ "$?" -ne 0 ]
+			then
+				echo
+				ewarn "Running /sbin/dolilo failed!  Please check what the problem is"
+				ewarn "before your next reboot."
+
+				ebeep 5
+				epause 5
+			fi
+		fi
+		echo
+	fi
+	if use !minimal; then
+		echo
+		einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
+		einfo "handles mounting and unmounting /boot for you. It can do more then"
+		einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
+		ebeep 5
+		epause 3
+		echo
+	fi
+}