Add a patch to fix compiling with --as-needed, thanks to Gergan Penkov for the patch, bug 135246

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 31 insertions, 10 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/Manifest b/app-office/mdbtools/Manifest
index 27d0d4e2e83a..973da2957232 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -2,6 +2,10 @@ AUX mdbtools-0.5-gcc34.patch 1682 RMD160 b8e28cafa5f891db2d084ebee0cc32634414e9b
 MD5 96e88f8e3b0a2ffc9628083a8b924d71 files/mdbtools-0.5-gcc34.patch 1682
 RMD160 b8e28cafa5f891db2d084ebee0cc32634414e9b4 files/mdbtools-0.5-gcc34.patch 1682
 SHA256 3e78debfa1406801bfa9db920989b69acbc5dd3e653598acfe7f799bff720c9e files/mdbtools-0.5-gcc34.patch 1682
+AUX mdbtools-0.6_pre1-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
+MD5 b140caa787f92bc4a87ea856d0dcbd3f files/mdbtools-0.6_pre1-as-needed.patch 482
+RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a files/mdbtools-0.6_pre1-as-needed.patch 482
+SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416 files/mdbtools-0.6_pre1-as-needed.patch 482
 AUX mdbtools-0.6_pre1-gcc34.patch 1571 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e SHA1 04e16d502c28cb065d04fc4afe68761380cd8521 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633
 MD5 7899f05ce1ebcdf1517ea62a21409da8 files/mdbtools-0.6_pre1-gcc34.patch 1571
 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e files/mdbtools-0.6_pre1-gcc34.patch 1571
@@ -16,14 +20,14 @@ EBUILD mdbtools-0.5.ebuild 1181 RMD160 fdf993562baa95ec3f786fb91a5bde81b3c5b8f0
 MD5 74e2feb6cc446de6d11236d50f0fed73 mdbtools-0.5.ebuild 1181
 RMD160 fdf993562baa95ec3f786fb91a5bde81b3c5b8f0 mdbtools-0.5.ebuild 1181
 SHA256 8398ed525831e99ac392d0a46401f6c9bc53851314231e0e9ac0ac83a6ee0947 mdbtools-0.5.ebuild 1181
-EBUILD mdbtools-0.6_pre1-r1.ebuild 1538 RMD160 7a29d9d06c96de28b04587889ee9fe37fb7200e1 SHA1 3e2c5e92e90d9d621a6d78e2c1501a456827bc59 SHA256 5a7e0b13e3e0e4dc4b4fb43c8d339a12185515f34be876c97d34f1c100b73478
-MD5 feaf92eac954a1f197c6c327acbae80c mdbtools-0.6_pre1-r1.ebuild 1538
-RMD160 7a29d9d06c96de28b04587889ee9fe37fb7200e1 mdbtools-0.6_pre1-r1.ebuild 1538
-SHA256 5a7e0b13e3e0e4dc4b4fb43c8d339a12185515f34be876c97d34f1c100b73478 mdbtools-0.6_pre1-r1.ebuild 1538
-MISC ChangeLog 2550 RMD160 0ef9e177b6996af1c74d9fe56a6be7813d2b25fb SHA1 503ef8576da5a81dec7331bfb38715b2a50ba5c7 SHA256 a0d683803cbf9dcb2e6af5829efe952d8aee79bb2f2975f16647a6b5f2cafa3a
-MD5 a8a4fd41bb2179c7114e8bf3bc5a0868 ChangeLog 2550
-RMD160 0ef9e177b6996af1c74d9fe56a6be7813d2b25fb ChangeLog 2550
-SHA256 a0d683803cbf9dcb2e6af5829efe952d8aee79bb2f2975f16647a6b5f2cafa3a ChangeLog 2550
+EBUILD mdbtools-0.6_pre1-r1.ebuild 1585 RMD160 2e55719094da0988e86520acfda9188434f5c181 SHA1 a864b8e2060e4eaec1092ce427c985fabd63252b SHA256 1b11b72ddbe72bb73475cb1106190ec8452e89cc6324bb1586e851ec5776b15e
+MD5 edf769938b02728b75968bd11af2285c mdbtools-0.6_pre1-r1.ebuild 1585
+RMD160 2e55719094da0988e86520acfda9188434f5c181 mdbtools-0.6_pre1-r1.ebuild 1585
+SHA256 1b11b72ddbe72bb73475cb1106190ec8452e89cc6324bb1586e851ec5776b15e mdbtools-0.6_pre1-r1.ebuild 1585
+MISC ChangeLog 2788 RMD160 3f00feb433afab8d657657cc2f10be91b52bace8 SHA1 60b8c20aa4ffbeeebecd1f170e9f42000a805906 SHA256 659da082ab51be2c356636766e83048e0f5d219c99e79f16492b0233e29cb9c1
+MD5 2f2b2f0da7dcc25ba2da702367d69507 ChangeLog 2788
+RMD160 3f00feb433afab8d657657cc2f10be91b52bace8 ChangeLog 2788
+SHA256 659da082ab51be2c356636766e83048e0f5d219c99e79f16492b0233e29cb9c1 ChangeLog 2788
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
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