diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-26 07:58:15 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-26 07:58:15 +0000 |
| commit | 9535a3a7ca36f7c50683d491fd6f3bd864c71c41 (patch) | |
| tree | 7c1e804227932e2c0c406583e0ce32c40670cf12 /dev-libs/libxml2 | |
| parent | Version bump (bug #300540), solves bug #316083 (failing tests) and bug #35200... (diff) | |
| download | gentoo-2-9535a3a7ca36f7c50683d491fd6f3bd864c71c41.tar.gz gentoo-2-9535a3a7ca36f7c50683d491fd6f3bd864c71c41.tar.bz2 gentoo-2-9535a3a7ca36f7c50683d491fd6f3bd864c71c41.zip | |
Prevent libxml2's python module from linking to out-of-build-tree libxml2 library by hacking the relink_command entry in its build-time .la file. Fixes bug #417539 ("'LIBXML2_2.7.9' not found" errors). Forced to drop hppa and amd64-fbsd keywords, bug #417569. Drop broken 2.8.0 ebuild.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libxml2')
| -rw-r--r-- | dev-libs/libxml2/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-libs/libxml2/libxml2-2.8.0-r1.ebuild (renamed from dev-libs/libxml2/libxml2-2.8.0.ebuild) | 7 |
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog index 076bd02a1cf9..86cc3e57c3b8 100644 --- a/dev-libs/libxml2/ChangeLog +++ b/dev-libs/libxml2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-libs/libxml2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.345 2012/05/25 07:13:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.346 2012/05/26 07:58:15 tetromino Exp $ + +*libxml2-2.8.0-r1 (26 May 2012) + + 26 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -libxml2-2.8.0.ebuild, +libxml2-2.8.0-r1.ebuild: + Prevent libxml2's python module from linking to out-of-build-tree libxml2 + library by hacking the relink_command entry in its build-time .la file. Fixes + bug #417539 ("'LIBXML2_2.7.9' not found" errors). Forced to drop hppa and + amd64-fbsd keywords, bug #417569. Drop broken 2.8.0 ebuild. *libxml2-2.8.0 (25 May 2012) diff --git a/dev-libs/libxml2/libxml2-2.8.0.ebuild b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild index 6f70ee875a85..bb3d6ab92b35 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.ebuild +++ b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0.ebuild,v 1.1 2012/05/25 07:13:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.1 2012/05/26 07:58:15 tetromino Exp $ EAPI="4" PYTHON_DEPEND="python? 2" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="debug doc examples icu ipv6 lzma python readline static-libs test" XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" @@ -36,6 +36,7 @@ RDEPEND="sys-libs/zlib readline? ( sys-libs/readline )" DEPEND="${RDEPEND} + python? ( dev-util/fix-la-relink-command ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" S="${WORKDIR}/${PN}-${PV%_rc*}" @@ -152,6 +153,8 @@ src_install() { if use python; then installation() { + # bug #417539 + fix-la-relink-command . || die "fix-la-relink-command failed" emake DESTDIR="${D}" \ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |