diff options
author | Markus Ullmann <jokey@gentoo.org> | 2007-09-01 15:51:47 +0000 |
---|---|---|
committer | Markus Ullmann <jokey@gentoo.org> | 2007-09-01 15:51:47 +0000 |
commit | f7141d7e173e62fbae8140af61c277dfefa7be3a (patch) | |
tree | 37544ff7a4c9710ec888dce77648219a661aa61a /dev-db/unixODBC | |
parent | if default value isnt set sanely, just skip it (diff) | |
download | gentoo-2-f7141d7e173e62fbae8140af61c277dfefa7be3a.tar.gz gentoo-2-f7141d7e173e62fbae8140af61c277dfefa7be3a.tar.bz2 gentoo-2-f7141d7e173e62fbae8140af61c277dfefa7be3a.zip |
Port --as-needed fix from project overlay
(Portage version: 2.1.3.7)
Diffstat (limited to 'dev-db/unixODBC')
-rw-r--r-- | dev-db/unixODBC/ChangeLog | 12 | ||||
-rw-r--r-- | dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch | 14 | ||||
-rw-r--r-- | dev-db/unixODBC/unixODBC-2.2.12.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog index fce7e994c981..f02e5b383ed8 100644 --- a/dev-db/unixODBC/ChangeLog +++ b/dev-db/unixODBC/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-db/unixODBC # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.71 2007/08/21 08:49:50 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.72 2007/09/01 15:51:47 jokey Exp $ + + 01 Sep 2007; Markus Ullmann <jokey@gentoo.org> + +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch, + unixODBC-2.2.12.ebuild: + Port --as-needed fix from project overlay + + 01 Sep 2007; Jakub Moc <jakub@gentoo.org> + +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch, + unixODBC-2.2.12.ebuild: + Fix compile with --as-needed and USE=gnome, Bug 173048 21 Aug 2007; Markus Ullmann <jokey@gentoo.org> unixODBC-2.2.12.ebuild: Depend on dev-util/cvs if USE=gnome is set, see Bug 173256 for reasons diff --git a/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch b/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch new file mode 100644 index 000000000000..566ad68aceb0 --- /dev/null +++ b/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch @@ -0,0 +1,14 @@ +-- gODBCConfig/src/Makefile.am.orig 2005-09-17 15:08:16.000000000 +0200 ++++ gODBCConfig/src/Makefile.am 2007-08-27 18:29:22.000000000 +0200 +@@ -22,6 +22,10 @@ + interface.h \ + callbacks.c callbacks.h + ++ ++libgtkodbcconfig_la_LIBADD = ../../odbcinst/libodbcinst.la ++ ++ + gODBCConfig_DEPENDENCIES = libgtkodbcconfig.la ../../ini/libinilc.la + + gODBCConfig_LDADD = $(GNOME_LIBDIR) \ + diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild index 842f1846c4da..acf02b14ee58 100644 --- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild +++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.11 2007/08/25 22:35:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.12 2007/09/01 15:51:47 jokey Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -32,6 +32,7 @@ src_unpack() { cd "${S}" epatch "${WORKDIR}"/${PATCH_P}/* + epatch "${FILESDIR}"/350-${P}-gODBCConfig-as-needed.patch } src_compile() { |