summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-01-27 16:52:11 +0000
committerMike Frysinger <vapier@gentoo.org>2008-01-27 16:52:11 +0000
commit0ec6155bda50fea8c57a7aa97d14751e4033317e (patch)
tree7f4b88312f61e24cbf1cc9df0403fb805760c052 /sys-apps/mtree
parentwww-apache/mod_auth_external removal; bug #203578 (diff)
downloadhistorical-0ec6155bda50fea8c57a7aa97d14751e4033317e.tar.gz
historical-0ec6155bda50fea8c57a7aa97d14751e4033317e.tar.bz2
historical-0ec6155bda50fea8c57a7aa97d14751e4033317e.zip
Add workaround for parallel build failure in libnbcompat with nbtypes.h.
Package-Manager: portage-2.1.4
Diffstat (limited to 'sys-apps/mtree')
-rw-r--r--sys-apps/mtree/ChangeLog5
-rw-r--r--sys-apps/mtree/Manifest22
-rw-r--r--sys-apps/mtree/mtree-2007.4.ebuild4
3 files changed, 18 insertions, 13 deletions
diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog
index 996a796c5452..05a508992727 100644
--- a/sys-apps/mtree/ChangeLog
+++ b/sys-apps/mtree/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/mtree
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.10 2008/01/26 21:57:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.11 2008/01/27 16:52:11 vapier Exp $
+
+ 27 Jan 2008; Mike Frysinger <vapier@gentoo.org> mtree-2007.4.ebuild:
+ Add workaround for parallel build failure in libnbcompat with nbtypes.h.
*mtree-2007.4 (26 Jan 2008)
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
index 9a0cb70f46ea..fcadd8e0f3a8 100644
--- a/sys-apps/mtree/Manifest
+++ b/sys-apps/mtree/Manifest
@@ -11,14 +11,14 @@ EBUILD mtree-1.5.ebuild 835 RMD160 ae86a118bd1d9e7b39d30a181c1d0f43aac75ce5 SHA1
MD5 fbf79a3ffa4b8748c84e086eb1238af3 mtree-1.5.ebuild 835
RMD160 ae86a118bd1d9e7b39d30a181c1d0f43aac75ce5 mtree-1.5.ebuild 835
SHA256 65002fed44ad69b715273e3272b1ca9d3518fcac3a560f849a3a111eaddd67b0 mtree-1.5.ebuild 835
-EBUILD mtree-2007.4.ebuild 923 RMD160 541967ffd05ebe8c58355f2548ae446504d6c10f SHA1 8cbb71017eb5a2dcb32bae4fe66d2b0be829b43a SHA256 a967b7e31f99235a54291a8a765b2d39d792969c4fb122ff016f00dd9b49c29f
-MD5 f741e4f9a614ec1250bb0b1e9ed89434 mtree-2007.4.ebuild 923
-RMD160 541967ffd05ebe8c58355f2548ae446504d6c10f mtree-2007.4.ebuild 923
-SHA256 a967b7e31f99235a54291a8a765b2d39d792969c4fb122ff016f00dd9b49c29f mtree-2007.4.ebuild 923
-MISC ChangeLog 1149 RMD160 e1a509fac2c05d50fd99a74171440e2997da6065 SHA1 44715d93a7c6b75f15f87a87d6ebd830459e9c98 SHA256 0d6132236d5ecba20ef350847a2211671ab18111be111223df5bf4278b95cc14
-MD5 a832dd2a425f53b5029113ba7e0f7062 ChangeLog 1149
-RMD160 e1a509fac2c05d50fd99a74171440e2997da6065 ChangeLog 1149
-SHA256 0d6132236d5ecba20ef350847a2211671ab18111be111223df5bf4278b95cc14 ChangeLog 1149
+EBUILD mtree-2007.4.ebuild 1031 RMD160 46d655e604a29fdb125213ee90e644a81e72bfc3 SHA1 0c5f3b07fd52f5f19e8a58dd40631cb30a43d34b SHA256 29998707e2e6c471efcbf3799bc1a8d758da78ea43e434ef46eecc4028637744
+MD5 360ba7b2d1a0338f6a78c975c3be6025 mtree-2007.4.ebuild 1031
+RMD160 46d655e604a29fdb125213ee90e644a81e72bfc3 mtree-2007.4.ebuild 1031
+SHA256 29998707e2e6c471efcbf3799bc1a8d758da78ea43e434ef46eecc4028637744 mtree-2007.4.ebuild 1031
+MISC ChangeLog 1296 RMD160 d28fe55fbf5c209e3e622fd96efd6bfcaca5b209 SHA1 7ac514487d93716e372e7fb35b6c432165996465 SHA256 d64a1d2f34f8dadba6e682bcf87aa42fac4d9e9fc589438e9c826ba607a8a4f7
+MD5 9a377acfad75570b0cde068c7f30f16a ChangeLog 1296
+RMD160 d28fe55fbf5c209e3e622fd96efd6bfcaca5b209 ChangeLog 1296
+SHA256 d64a1d2f34f8dadba6e682bcf87aa42fac4d9e9fc589438e9c826ba607a8a4f7 ChangeLog 1296
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -32,7 +32,7 @@ SHA256 cded4f305c66c2490857ed26d9c6d2243bbad81b7d61de1ee4d226f067557a27 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHm6zej9hvisErhMIRAllPAKCbCrXp7uGrHrOwXg9Y0ZHbtFV1BQCfdMw0
-DxoDlK9Joq5SLzvlo+Y1bOY=
-=cvWa
+iD8DBQFHnLbBj9hvisErhMIRAmYqAKDGq1mxsx+AJ0cV3SQy3JqI/iUkBACfXsE3
+vu06C+50b+dJ/oqWI0lPfmI=
+=adCP
-----END PGP SIGNATURE-----
diff --git a/sys-apps/mtree/mtree-2007.4.ebuild b/sys-apps/mtree/mtree-2007.4.ebuild
index b40706df3cc9..c62e552aded7 100644
--- a/sys-apps/mtree/mtree-2007.4.ebuild
+++ b/sys-apps/mtree/mtree-2007.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.1 2008/01/26 21:57:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.2 2008/01/27 16:52:11 vapier Exp $
inherit flag-o-matic
@@ -19,6 +19,8 @@ S=${WORKDIR}/pkgsrc/pkgtools
src_compile() {
cd "${S}"/libnbcompat/files
econf || die "econf libnbcompat failed"
+ # workaround weak makefile dependencies
+ emake nbcompat/nbtypes.h || die "emake nbcompat/nbtypes.h failed"
emake || die "emake libnbcompat failed"
cd "${S}"/mtree/files
append-cppflags -I../../libnbcompat/files