diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2012-01-20 21:11:17 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2012-01-20 21:11:17 +0000 |
| commit | 6c4f3e94bc01ea36006f1e6f8d83e459ee340d0e (patch) | |
| tree | f662a1da3b3190f859484cf7e4d151d3fc31258e /profiles/prefix | |
| parent | wrong #bug in precedent commit message (diff) | |
| download | gentoo-2-6c4f3e94bc01ea36006f1e6f8d83e459ee340d0e.tar.gz gentoo-2-6c4f3e94bc01ea36006f1e6f8d83e459ee340d0e.tar.bz2 gentoo-2-6c4f3e94bc01ea36006f1e6f8d83e459ee340d0e.zip | |
comment out the AT_SYS_M4DIR stuff because it breaks packages (bug 397563)
Diffstat (limited to 'profiles/prefix')
| -rw-r--r-- | profiles/prefix/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/prefix/profile.bashrc | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog index a4a23bc85161..682554f353e5 100644 --- a/profiles/prefix/ChangeLog +++ b/profiles/prefix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for profiles/prefix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.322 2012/01/14 11:03:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.323 2012/01/20 21:11:17 darkside Exp $ + + 20 Jan 2012; Jeremy Olexa <darkside@gentoo.org> profile.bashrc: + comment out the AT_SYS_M4DIR stuff because it breaks packages (bug 397563) 14 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> package.use.mask: Mask dev-python/numexpr[mkl] diff --git a/profiles/prefix/profile.bashrc b/profiles/prefix/profile.bashrc index 819330e84b0d..abb85c22c448 100644 --- a/profiles/prefix/profile.bashrc +++ b/profiles/prefix/profile.bashrc @@ -1,5 +1,5 @@ -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Id: profile.bashrc,v 1.3 2011/12/15 20:50:52 grobian Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Id: profile.bashrc,v 1.4 2012/01/20 21:11:17 darkside Exp $ # Hack to avoid every package that uses libiconv/gettext # install a charset.alias that will collide with libiconv's one @@ -24,6 +24,8 @@ profile-post_src_install() { prefix-post_src_install ; } # Always add ${EPREFIX}/usr/share/aclocal to accommodate situations where # aclocal comes from another EPREFIX (for example cross-EPREFIX builds). # Note: AT_SYS_M4DIR gets eval-ed -[[ -d ${EPREFIX}/usr/share/aclocal ]] && \ - AT_SYS_M4DIR+=' -I ${EPREFIX}/usr/share/aclocal' - +# The profile gets sources multiple times, so the below line breaks packages. It +# is stated that this line isn't needed now (bug 397563) and it will need to be +# fixed eventually by interested person(s) +#[[ -d ${EPREFIX}/usr/share/aclocal ]] && \ +# AT_SYS_M4DIR+=' -I ${EPREFIX}/usr/share/aclocal' |