diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-06-29 22:56:44 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-06-29 22:56:44 +0000 |
| commit | 5549b322b2834cc6c74d51eaea52651ea7f541a0 (patch) | |
| tree | 22924e2c4e50dd51405b1653fc78474964c5527e /media-gfx/iscan | |
| parent | set localstatedir, bug #217406 (diff) | |
| download | gentoo-2-5549b322b2834cc6c74d51eaea52651ea7f541a0.tar.gz gentoo-2-5549b322b2834cc6c74d51eaea52651ea7f541a0.tar.bz2 gentoo-2-5549b322b2834cc6c74d51eaea52651ea7f541a0.zip | |
Fix libtool-2.2 breakage and do a full eautoreconf wrt bug #226315.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'media-gfx/iscan')
| -rw-r--r-- | media-gfx/iscan/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/iscan/files/iscan-2.11.0-libltdl.patch | 45 | ||||
| -rw-r--r-- | media-gfx/iscan/iscan-2.11.0.ebuild | 7 |
3 files changed, 55 insertions, 3 deletions
diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog index 58138791b968..a4c13e126250 100644 --- a/media-gfx/iscan/ChangeLog +++ b/media-gfx/iscan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/iscan # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.28 2008/06/29 10:41:30 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.29 2008/06/29 22:56:43 loki_val Exp $ + + 29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> + +files/iscan-2.11.0-libltdl.patch, iscan-2.11.0.ebuild: + Fix libtool-2.2 breakage and do a full eautoreconf wrt bug #226315. 29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> +files/iscan-2.11.0-gcc43.patch, iscan-2.11.0.ebuild: diff --git a/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch b/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch new file mode 100644 index 000000000000..5b767cfb8f07 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch @@ -0,0 +1,45 @@ +--- configure.ac ++++ configure.ac +@@ -30,7 +30,10 @@ AC_SUBST(PACKAGE_RELEASE,1) dnl keep A + + AC_CONFIG_HEADER([config.h]) + AC_CONFIG_SRCDIR([backend/epkowa.c]) ++dnl Detect old libtool ++m4_ifndef([LT_OUTPUT], [ + AC_CONFIG_SUBDIRS([libltdl]) ++]) + + AM_INIT_AUTOMAKE([gnu 1.7]) + +@@ -196,10 +199,10 @@ dnl The somewhat obscure LT_AC_PROG_SED + dnl SED environment variable gets set before it's used by the libtool + dnl machinery. This works around buggy libtool versions. + LT_AC_PROG_SED +-AC_LIB_LTDL + AC_LIBLTDL_CONVENIENCE + AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL ++AC_LIB_LTDL + AC_SUBST(LTDLINCL) + AC_SUBST(LIBLTDL) + +--- lib/imgstream.cc ++++ lib/imgstream.cc +@@ -211,6 +211,17 @@ int selector (const dirent *); + imgstream::dl_handle + imgstream::find_dlopen (const char *libname) + { ++// forward compatibility ++#ifndef LTDL_SHLIB_EXT ++#define LTDL_SHLIB_EXT LT_MODULE_EXT ++#endif ++#ifndef LTDL_SHLIBPATH_VAR ++#define LTDL_SHLIBPATH_VAR LT_MODULE_PATH_VAR ++#endif ++#ifndef LTDL_SYSSEARCHPATH ++#define LTDL_SYSSEARCHPATH LT_DLSEARCH_PATH ++#endif ++ + using std::bad_alloc; + + dl_handle result = NULL; diff --git a/media-gfx/iscan/iscan-2.11.0.ebuild b/media-gfx/iscan/iscan-2.11.0.ebuild index ac5628461466..ec602778fcc4 100644 --- a/media-gfx/iscan/iscan-2.11.0.ebuild +++ b/media-gfx/iscan/iscan-2.11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.11.0.ebuild,v 1.2 2008/06/29 10:39:09 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.11.0.ebuild,v 1.3 2008/06/29 22:56:43 loki_val Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -199,8 +199,11 @@ src_unpack() { fi epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-libltdl.patch # autotool stuff - eautoconf + rm libltdl/acinclude.m4 + rm m4/libtool.m4 + eautoreconf } src_compile() { |