diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-01-06 23:45:29 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-01-06 23:45:29 +0000 |
| commit | 43a5d6087c76d742d0464bfe9050552fa49d6c11 (patch) | |
| tree | e0d4c8108a9e47425d764d6da97ed28cc1f75bdb /dev-libs/libprelude | |
| parent | Bump to latest upstream version (diff) | |
| download | gentoo-2-43a5d6087c76d742d0464bfe9050552fa49d6c11.tar.gz gentoo-2-43a5d6087c76d742d0464bfe9050552fa49d6c11.tar.bz2 gentoo-2-43a5d6087c76d742d0464bfe9050552fa49d6c11.zip | |
Fix building with libtool 2.4 by Radoslaw Szkodzinski (bug #347079).
(Portage version: 2.2.0_alpha13/cvs/Linux i686)
Diffstat (limited to 'dev-libs/libprelude')
| -rw-r--r-- | dev-libs/libprelude/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/libprelude/files/libprelude-1.0.0-libtool.patch | 21 | ||||
| -rw-r--r-- | dev-libs/libprelude/libprelude-1.0.0-r1.ebuild | 10 |
3 files changed, 34 insertions, 5 deletions
diff --git a/dev-libs/libprelude/ChangeLog b/dev-libs/libprelude/ChangeLog index d37287e38c03..ae787393c915 100644 --- a/dev-libs/libprelude/ChangeLog +++ b/dev-libs/libprelude/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libprelude -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.71 2010/05/27 15:57:24 jer Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.72 2011/01/06 23:45:29 jer Exp $ + + 06 Jan 2011; Jeroen Roovers <jer@gentoo.org> libprelude-1.0.0-r1.ebuild, + +files/libprelude-1.0.0-libtool.patch: + Fix building with libtool 2.4 by Radoslaw Szkodzinski (bug #347079). *libprelude-1.0.0-r1 (27 May 2010) diff --git a/dev-libs/libprelude/files/libprelude-1.0.0-libtool.patch b/dev-libs/libprelude/files/libprelude-1.0.0-libtool.patch new file mode 100644 index 000000000000..c6f147f0c6be --- /dev/null +++ b/dev-libs/libprelude/files/libprelude-1.0.0-libtool.patch @@ -0,0 +1,21 @@ +libtool 2.4 changed lt__PROGRAM__LTX_preloaded_symbols definition to + +extern LT_DLSYM_CONST lt_dlsymlist lt__PROGRAM__LTX_preloaded_symbols[]; + +but there is no easy way to find its version to fix it properly, so it's a +temporary hack to make at least libprelude compile. +Index: libprelude-1.0.0/src/include/prelude-plugin.h +=================================================================== +--- libprelude-1.0.0.orig/src/include/prelude-plugin.h 2010-11-06 21:30:18.000000000 +0300 ++++ libprelude-1.0.0/src/include/prelude-plugin.h 2010-11-06 21:30:47.000000000 +0300 +@@ -61,9 +61,8 @@ + */ + #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2 + # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols +-#endif +- + extern const void *lt_preloaded_symbols[]; ++#endif + + #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \ + prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols) diff --git a/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild b/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild index 7019813a684d..566ed0d6642f 100644 --- a/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild +++ b/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild,v 1.1 2010/05/27 15:57:24 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild,v 1.2 2011/01/06 23:45:29 jer Exp $ EAPI=2 -inherit perl-module flag-o-matic eutils +inherit libtool perl-module flag-o-matic eutils DESCRIPTION="Prelude-IDS Framework Library" HOMEPAGE="http://www.prelude-technologies.com" @@ -21,6 +21,10 @@ RDEPEND=">=net-libs/gnutls-1.0.17 DEPEND="${RDEPEND} sys-devel/flex" +src_prepare() { + epatch "${FILESDIR}"/${P}-libtool.patch +} + src_configure() { filter-lfs-flags econf \ |