diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-11-09 16:58:00 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-11-09 16:58:00 +0000 |
| commit | fcf4a3a8ab79ea8b618ee05a5016b8dfe4c22b03 (patch) | |
| tree | 84665efdfe079266a2f1722982a82ec4e7b1d638 /dev-vcs | |
| parent | Initial commit (diff) | |
| download | gentoo-2-fcf4a3a8ab79ea8b618ee05a5016b8dfe4c22b03.tar.gz gentoo-2-fcf4a3a8ab79ea8b618ee05a5016b8dfe4c22b03.tar.bz2 gentoo-2-fcf4a3a8ab79ea8b618ee05a5016b8dfe4c22b03.zip | |
Don't enable LD_PRELOAD kludge on Solaris, it breaks in case of a mismatch between userland and current build target.
(Portage version: 2.2.01.21313-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/subversion/subversion-1.7.7.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index 807670ce50bd..fd5874072aaf 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.85 2012/10/25 17:07:41 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.86 2012/11/09 16:58:00 grobian Exp $ + + 09 Nov 2012; Fabian Groffen <grobian@gentoo.org> subversion-1.7.7.ebuild: + Don't enable LD_PRELOAD kludge on Solaris, it breaks in case of a mismatch + between userland and current build target. *subversion-1.7.7 (25 Oct 2012) diff --git a/dev-vcs/subversion/subversion-1.7.7.ebuild b/dev-vcs/subversion/subversion-1.7.7.ebuild index 53f53ee6dfd0..b2fab41cebb2 100644 --- a/dev-vcs/subversion/subversion-1.7.7.ebuild +++ b/dev-vcs/subversion/subversion-1.7.7.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-vcs/subversion/subversion-1.7.7.ebuild,v 1.1 2012/10/25 17:07:41 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.2 2012/11/09 16:58:00 grobian Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -160,6 +160,12 @@ src_configure() { *-solaris*) # need -lintl to link use nls && append-libs intl + # this breaks installation, on x64 echo replacement is 32-bits + myconf+=" --disable-local-library-preloading" + ;; + *) + # inject LD_PRELOAD entries for easy in-tree development + myconf+=" --enable-local-library-preloading" ;; esac @@ -190,7 +196,6 @@ src_configure() { --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ --disable-experimental-libtool \ --without-jikes \ - --enable-local-library-preloading \ --disable-mod-activation \ --disable-neon-version-check \ --disable-static |