diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-01-11 18:09:31 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-01-11 18:09:31 +0000 |
| commit | 39b4041f5efd70ecd28eb50e103ebc8849aa0c1e (patch) | |
| tree | 89dbf158e840fe66c57c93a394324a3f4263d538 /app-office/mdbtools | |
| parent | alpha/ia64 stable wrt #298237 (diff) | |
| download | gentoo-2-39b4041f5efd70ecd28eb50e103ebc8849aa0c1e.tar.gz gentoo-2-39b4041f5efd70ecd28eb50e103ebc8849aa0c1e.tar.bz2 gentoo-2-39b4041f5efd70ecd28eb50e103ebc8849aa0c1e.zip | |
Fix parallel make issue #253584. Patch by Nico Roeser.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'app-office/mdbtools')
| -rw-r--r-- | app-office/mdbtools/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch | 17 | ||||
| -rw-r--r-- | app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild | 5 |
3 files changed, 25 insertions, 3 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/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) |