Fix parallel make issue #253584. Patch by Nico Roeser.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 31 insertions, 8 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 0a2f26a56bdf..c1418d33af36 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.43 2010/01/03 14:50:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.44 2010/01/11 18:09:30 graaff Exp $
+
+  11 Jan 2010; Hans de Graaff <graaff@gentoo.org>
+  mdbtools-0.6_pre2-r1.ebuild, +files/mdbtools-0.6_pre2-parallel-make.patch:
+  Fix parallel make issue #253584. Patch by Nico Roeser.
 
 *mdbtools-0.6_pre2-r1 (03 Jan 2010)
 
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 46efac264786..a0c5a2eda008 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -8,17 +8,18 @@ AUX mdbtools-0.6_pre1-strlen.patch 284 RMD160 cfa88cda151cfb7f63cc7fbd3cb366d00f
 AUX mdbtools-0.6_pre2-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre2-gcc34.patch 1468 RMD160 fc1ba2a523bf9dd4c0dd0601d70db4e5374ec1b2 SHA1 ae4dc5100d6fc097cddb93164cad360640da6405 SHA256 ae0f0ea67b9bcc8851073acba54297268f00a31a0d286b59680f7a28f15ba108
 AUX mdbtools-0.6_pre2-haveiconv-fix.patch 660 RMD160 6fc78057697eda733e6526573c47cfe2be950012 SHA1 cc5add40346b1aeb61985d0de6a65f3a3a39af63 SHA256 e7fc8f4809968f0cfc8e890d8dc6ca98abd51f1c243d25276e566f88f9461887
+AUX mdbtools-0.6_pre2-parallel-make.patch 642 RMD160 ea61869f587bc175a4b786e0be00fd41bbb1bdd3 SHA1 116d58ed77a7e0575c53b8f0944bdc544bc8750d SHA256 bd77667fb34421dd934e444e914e736f08c8c2ac14e8172e693197907958b7bf
 DIST mdbtools-0.6pre1.tar.gz 611756 RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 SHA1 37a50d623a444ec690d2677b12b59c2f11e497c0 SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
 DIST mdbtools-cvs-20050624.tar.gz 306961 RMD160 800328d9acc763ce58211b5a37ad20b8ce34cc21 SHA1 15c97da82826935032aa2089d3e9ed7e2931ce43 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3
 EBUILD mdbtools-0.6_pre1-r1.ebuild 1881 RMD160 1dab3e8bb357913103e6493535368dce195e2fa3 SHA1 5e83ffc7162230642668472ef93404a8a4f4ee89 SHA256 9b4246179a80d36e3e3db927500d4cf9c06df423a9c1bc9b95450049d741fcd5
-EBUILD mdbtools-0.6_pre2-r1.ebuild 1801 RMD160 d008e8b4a471dbc76ac4326f614da62feffec667 SHA1 82149ceb1889ece10d2f75af3faaffdbd05cdf63 SHA256 9a1853163b2c957f3f07049577397cc7c7d2b2e70a2097bb55136ad26116caa0
+EBUILD mdbtools-0.6_pre2-r1.ebuild 1849 RMD160 7d0fafd1c8ad00a9b0c448220c246c930cd35fb2 SHA1 ecb524918c26c4dc7283c1576bed6d2865450a5e SHA256 741fec408275203b07c10247bb0cd575e487a184591b4d863964cca407b85273
 EBUILD mdbtools-0.6_pre2.ebuild 1820 RMD160 d58c0b05c54b1e6a90d3ddec8bacfbe2fbf8d35a SHA1 958758cb6299594c6e02cf3a2c9897bba4d8da5c SHA256 df89b4bf0777b683a48422566f6360437a4e48a473c756c148d59dd366ec3e76
-MISC ChangeLog 5887 RMD160 dfefe33f6e9f42bc7d390cbf8f08ad361b87ae36 SHA1 1d46ec4c3b77e495991cdcb7e23731d9fb0cac99 SHA256 73b60eff457cb2f251c95df2c87b476c5c225af4bd5189b4c56a4f0a3743c2f6
+MISC ChangeLog 6072 RMD160 7b6c7cab6c1c08ac6cf8f4887317fdc26351add4 SHA1 ad02b1a2cdc3742ba5c939f7dc967cc5593b9b1c SHA256 c356bf748f01255dae907159cec71de86f68c3c921c0eeb00a3a77b232b3310c
 MISC metadata.xml 220 RMD160 65cff73eb25c0cc60095d42dd59adbefcb127b77 SHA1 059c076f5c2d3a1eb0b022ef90920bcabaf841b3 SHA256 0f420960bb0e6e212e563ce0883b0e412304dfd506a39e434d2c7a40a603ba86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktArsgACgkQeM7EJeUH71PpQACfRNafg40wh8sD/CvrzQmODbyp
-rksAnRgVQK4q+7S6AKrY3SRC0wwpbojU
-=Dow8
+iEYEARECAAYFAktLaWAACgkQeM7EJeUH71NXHgCfenMHe/Aw8C8oqb9FiOulQcqw
+yaIAn25ISCuGQPvRfydiGatjHp93fA+r
+=4V23
 -----END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch
new file mode 100644
index 000000000000..f1d0ae77b9a6
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch
@@ -0,0 +1,17 @@
+--- mdbtools-cvs-20050624.orig/src/sql/Makefile.am	2005-01-15 05:02:06.000000000 +0000
++++ mdbtools-cvs-20050624/src/sql/Makefile.am	2010-01-09 13:48:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES	=	libmdbsql.la
+-libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l 
++libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l parser.h
+ libmdbsql_la_LDFLAGS = -version-info 1:0:0
+ DISTCLEANFILES = parser.c parser.h lexer.c
+ AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+@@ -7,5 +7,7 @@
+ LDADD	=	../libmdb/libmdb.la 
+ YACC = @YACC@ -d
+ 
++parser.h: parser.$(OBJEXT)
++
+ dist-hook:
+ 	rm -f $(distdir)/parser.c $(distdir)/parser.h $(distdir)/lexer.c
diff --git a/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild b/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild
index a84309308d36..fb2373540fba 100644
--- a/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild
+++ b/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild,v 1.1 2010/01/03 14:50:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild,v 1.2 2010/01/11 18:09:30 graaff Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.7"
@@ -35,6 +35,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc34.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 	epatch "${FILESDIR}"/${P}-haveiconv-fix.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
 
 	# This is necessary since the upstream tarball was created with a
 	# buggy libtool, and the .so suffix in library names is lost in
@@ -53,7 +54,7 @@ src_configure() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die "Installation failed"
 	dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
 
 	# add a compat symlink (gmdb2 is not compiled if gnome USE flag is disabled)