summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2006-12-04 21:30:45 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2006-12-04 21:30:45 +0000
commit37ce293a45febe1dde36d36c324d52f7010415be (patch)
tree6d497193016ae5a504c19e160489bab64003d35b /app-office
parentStable on IA64; bug #144999. (diff)
downloadgentoo-2-37ce293a45febe1dde36d36c324d52f7010415be.tar.gz
gentoo-2-37ce293a45febe1dde36d36c324d52f7010415be.tar.bz2
gentoo-2-37ce293a45febe1dde36d36c324d52f7010415be.zip
Add a patch to fix compiling with --as-needed, thanks to Gergan Penkov for the patch, bug 135246
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/mdbtools/ChangeLog7
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch11
-rw-r--r--app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index ba4dfe7102f8..e9fe89357fcd 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/mdbtools
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.21 2006/11/17 19:30:35 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.22 2006/12/04 21:30:45 masterdriverz Exp $
+
+ 04 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+ +files/mdbtools-0.6_pre1-as-needed.patch, mdbtools-0.6_pre1-r1.ebuild:
+ Add a patch to fix compiling with --as-needed, thanks to Gergan Penkov for
+ the patch, bug 135246
*mdbtools-0.6_pre1-r1 (17 Nov 2006)
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch
new file mode 100644
index 000000000000..fc424b6d62da
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch
@@ -0,0 +1,11 @@
+--- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
++++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
+@@ -15,7 +15,7 @@
+ $(patsubst %.c, %.lo, $(SQLSOURCES))) \
+ $(patsubst %, $(MDBDIR)/%, \
+ $(patsubst %.c, %.lo, $(MDBSOURCES)))
+-LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
++LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
+ unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
+
+ ## Need blank statement to avoid compiling odbc.c
diff --git a/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild b/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild
index fa79b639025f..d53884651f20 100644
--- a/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild
+++ b/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild,v 1.1 2006/11/17 19:30:35 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild,v 1.2 2006/12/04 21:30:45 masterdriverz Exp $
WANT_AUTOMAKE="1.7"
@@ -34,6 +34,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-gcc34.patch
epatch "${FILESDIR}"/${P}-gcc41.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
# This is necessary since the upstream tarball was created with a buggy
# libtool, and the .so suffix in library names is lost in some platforms