Fix parallel build #380717 by Cédric Jeanneret, and clean up bind tweaks with patches.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 68 insertions, 27 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index ef2ab71d1068..b249409203d6 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.182 2011/08/26 10:02:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.183 2011/08/27 04:58:56 vapier Exp $
+
+  27 Aug 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2.ebuild,
+  +files/dhcp-4.2.2-bind-build-flags.patch,
+  +files/dhcp-4.2.2-bind-disable.patch,
+  +files/dhcp-4.2.2-bind-parallel-build.patch:
+  Fix parallel build #380717 by Cédric Jeanneret, and clean up bind tweaks
+  with patches.
 
   26 Aug 2011; Thomas Kahle <tomka@gentoo.org> dhcp-4.2.2.ebuild:
   x86 stable per bug 378799
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 4841cc9498ea..c154dc3b9571 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
 AUX dhcp-3.0.2-gmake.patch 1872 RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e SHA1 f60c89233f06ca8554cd5cc9ed0301b597a724f7 SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215
@@ -22,6 +19,9 @@ AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd
 AUX dhcp-4.2.0-errwarn-message.patch 1508 RMD160 604c680c22b620ae11e4c1ab83902a0c3dacaa62 SHA1 8d645f2510dac8c68d6114cb3f3c0077d832f8c0 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231
 AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 RMD160 e226e793ab4d1302dbaf288c3077f3f6c8758b97 SHA1 d4ea97c3383c7f7769ab36c8d36674a3297dc1f9 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c
 AUX dhcp-4.2.1-nogateway.patch 1648 RMD160 820956e072e4a84ffabdee6714377ae23827b7bf SHA1 5c6c8118ee6b4b8524451827756aab052766ca09 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4
+AUX dhcp-4.2.2-bind-build-flags.patch 470 RMD160 d9fda98de985ed25354b63e1559f35d1cf3d7abc SHA1 96b10820eb38eddf4a2cd73f190f5735db24478d SHA256 289ea12b0d46707fcbb48127c637a5897b472abf9ab990d784101c255cdd8838
+AUX dhcp-4.2.2-bind-disable.patch 390 RMD160 02204d85273a8f54765b0eb9aac3b6236e4ceaba SHA1 0736031fce4f00ee7734322955037db65f736dc9 SHA256 0871e10198af86414f85c72d21beec640cb0b7c7c4ccea2550d4886bade1417e
+AUX dhcp-4.2.2-bind-parallel-build.patch 304 RMD160 76ed813b19206ec780aa3a7ccc44aaf7037f704c SHA1 20cbf2cf57060a3c573bf9b8ef69b91ec81d487f SHA256 cff322da581742ef1a8019641ee9689c588c3f9fef883b55e28af52823f08838
 AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 RMD160 7527ea3e52a6913ae3ba2d8a6e07cc3d1c04f492 SHA1 02d83d591d361d6a6543245b39a51531f8926cc4 SHA256 a87f33e33fc3f3a103264909cc85c477036949f2c00c428d562c12b560f09877
 AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 RMD160 9d43cb04b50ca91c680b195eb33ca68c2d06a2a7 SHA1 5ceb5ea6ec3c444df14c04585ff1482ffe8b9e35 SHA256 701da4d022490bf9e1cfd946c752a00a2d2ab9a1fd5030281c1608f367cc68fe
 AUX dhcp-4.2.2-nogateway.patch 1671 RMD160 bf401172a4c379f4c51c7afcd912c3e7faef6140 SHA1 1a82353a031d49ecc27441bbb9640de9e6ff5530 SHA256 3fed5823812c134e1819c8ac10c5fc718df86f4013ffc7505efbbe692319480e
@@ -38,13 +38,6 @@ DIST dhcp-4.2.2.tar.gz 8764108 RMD160 a7d0a66a6156cc2194a784b120587ffd5e8e200e S
 EBUILD dhcp-3.1.2_p1.ebuild 7582 RMD160 d7f42417b80f9f17e0c8c217c978707506802a22 SHA1 be9987191d730c6065c74fc8c9e8835e5d229561 SHA256 4ebe414e6dc4ce6f6b9ebf4f0bfd44b6af03330ff48c39ad7c9987ac1cae624f
 EBUILD dhcp-3.1.3_p1.ebuild 7741 RMD160 62ef4cf524beadef2847675416ea5982f23a3f8e SHA1 3995b5c53d6b11fde440cf43c0dacac31f084d72 SHA256 7a71c86e1685858826a09f28dff77d69a98ec1d37c93bbb6e4dd216af00ce96c
 EBUILD dhcp-4.2.1_p1.ebuild 6610 RMD160 0d058e755de185a58fc62a3d047021671de9a54a SHA1 5cf96d94250ba44b3120ae6a961c04e4f01996b5 SHA256 70534d654d5a2d02ea009d87f77bf86724ee94b7587f5b6959eef90475e5062a
-EBUILD dhcp-4.2.2.ebuild 7504 RMD160 3374eb1fd05ea2f0b4b96d6f33cecea8b0363ce6 SHA1 7478154be9162b00e100ef514fc9eaac2663925c SHA256 88851926016471bd76f022ea4f1d927f6844a7e348cc17131bdf312ada38cbac
-MISC ChangeLog 31203 RMD160 7bda1c5b1a5c54d1fb4247e575f5dca21ee5b7a0 SHA1 35d557a8a03282ee7e5237c443def7b6258f7532 SHA256 9eac7c2dd36040f00eafc9da09ee6d7cbbba1bb657065e0ec36962e3973f9b87
+EBUILD dhcp-4.2.2.ebuild 7474 RMD160 a80b1fb2eb31ba8dc20f9d6fb914e37a5cf12174 SHA1 089b6bb9e87f07c950d7ee4261e081ba59f29fa5 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755
+MISC ChangeLog 31497 RMD160 d5f79f68712e5af8fe28745b0fecaaff1fb2e84f SHA1 f8a19a8decb657f8be3324b1067379300664a742 SHA256 aa39bdd6f705d61655db71dc08a28692f92b6bd695ca603a120c16b2b1e74fda
 MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk5XbysACgkQodBTJSDyo65KvAD/UXvYQVTzqinenONXoIU080EJ
-qo/gRCl0B8T+jKuxB0cA/2pnpQy5OBLGhh6GMyPNFkV4el4bRhh6RfJ4yS15cQmA
-=BNXP
------END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.2.2.ebuild b/net-misc/dhcp/dhcp-4.2.2.ebuild
index d5ed3ba6c5bf..8aa447569557 100644
--- a/net-misc/dhcp/dhcp-4.2.2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2.ebuild,v 1.2 2011/08/26 10:02:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2.ebuild,v 1.3 2011/08/27 04:58:56 vapier Exp $
 
 EAPI="2"
 
@@ -27,6 +27,7 @@ DEPEND="selinux? ( sec-policy/selinux-dhcp )
 		net-nds/openldap
 		ssl? ( dev-libs/openssl )
 	)"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -104,24 +105,21 @@ src_prepare() {
 
 	# make the bind build work
 	binddir=${S}/bind
-	cat <<-EOF > "${binddir}"/bindvar.tmp
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
 	binddir=${binddir}
 	GMAKE=${MAKE:-gmake}
 	EOF
-	sed -i '/^all:/s,$,\nfoo:,' "${binddir}"/Makefile || die
-	# since the bind source is dynamic, sed it rather than patch
-	sed -i -r \
-		-e '/CC.*ALL_CFLAGS/{
-			s:(CC):BUILD_\1:;
-			s:ALL(_CFLAGS.):BUILD\1 $(CINCLUDES):;
-			s:(LDFLAGS):BUILD_\1:
-		}' \
-		-e '/BUILD_CC/s:ISC_INCLUDES:CINCLUDES:' \
-		"${binddir}"/bind-*/lib/export/dns/Makefile.in || die
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
 }
 
 src_configure() {
-	tc-export BUILD_CC
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
 
 	econf \
 		--enable-paranoia \
@@ -141,7 +139,9 @@ src_configure() {
 
 	# configure local bind cruft
 	cd bind/bind-*/ || die
-	eval econf $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile)
+	eval econf \
+		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
+		--without-make-clean
 }
 
 src_compile() {
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
new file mode 100644
index 000000000000..5d74e1a83022
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
@@ -0,0 +1,14 @@
+bind sets up BUILD_XXX vars for building native tools, but then
+doesn't use them for the "gen" tool
+
+--- a/bind/lib/export/dns/Makefile.in
++++ b/bind/lib/export/dns/Makefile.in
+@@ -166,7 +166,7 @@
+ 	./gen -s ${srcdir} > code.h
+ 
+ gen: ${srcdir}/gen.c
+-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	${BUILD_CC} ${BUILD_CFLAGS} ${CINCLUDES} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
+ 
+ #We don't need rbtdb64 for this library
+ #rbtdb64.@O@: rbtdb.c
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch
new file mode 100644
index 000000000000..4c7810e89b8e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch
@@ -0,0 +1,13 @@
+we take care of building this ourselves in the ebuild so
+build settings are properly respected
+
+--- dhcp-4.2.2/bind/Makefile
++++ dhcp-4.2.2/bind/Makefile
+@@ -29,6 +29,7 @@
+ bindsrcdir=bind-${version}
+ 
+ all:
++disable:
+ # Extract the source from the tarball, if it hasn't been already.
+ 	@if test -d ${bindsrcdir} ; then                    \
+ 		echo ${bindsrcdir} already unpacked... ;    \
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
new file mode 100644
index 000000000000..6136154f65a0
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
@@ -0,0 +1,14 @@
+fix the bind subdir parallel builds
+
+https://bugs.gentoo.org/380717
+
+--- a/bind/lib/export/isc/Makefile.in
++++ b/bind/lib/export/isc/Makefile.in
+@@ -114,6 +114,7 @@
+ 		-DLIBAGE=${LIBAGE} \
+ 		-c ${srcdir}/version.c
+ 
++${OBJS}: | subdirs
+ libisc.@SA@: ${OBJS}
+ 	${AR} ${ARFLAGS} $@ ${OBJS}
+ 	${RANLIB} $@