diff options
| author |   Javier Villavicencio <the_paya@gentoo.org> | 2009-01-24 21:58:18 +0000 |
|---|---|---|
| committer | Javier Villavicencio <the_paya@gentoo.org> | 2009-01-24 21:58:18 +0000 |
| commit | 18586e3f944a1eaa7dca91017505b1bd085e2e8a (patch) | |
| tree | 33dcc19807e048112c74248c873153d8dfcc9e3c /profiles/default/bsd | |
| parent | Updated install-sh patches from bug 196728 to fix parallel make install failu... (diff) | |
| download | gentoo-2-18586e3f944a1eaa7dca91017505b1bd085e2e8a.tar.gz gentoo-2-18586e3f944a1eaa7dca91017505b1bd085e2e8a.tar.bz2 gentoo-2-18586e3f944a1eaa7dca91017505b1bd085e2e8a.zip | |
Fix for the charset.alias collisions, bugs 169678, 195148 and 256129
Diffstat (limited to 'profiles/default/bsd')
| -rw-r--r-- | profiles/default/bsd/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/default/bsd/fbsd/profile.bashrc | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog index af869c89f87c..e5b31c857f81 100644 --- a/profiles/default/bsd/ChangeLog +++ b/profiles/default/bsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.11 2009/01/24 08:10:24 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.12 2009/01/24 21:58:18 the_paya Exp $ + + 24 Jan 2009; Javier Villavicencio <the_paya@gentoo.org> + fbsd/profile.bashrc: + profile.bashrc fix for the charset.alias bugs: 169678, 195148 and 256129 24 Jan 2009; Javier Villavicencio <the_paya@gentoo.org> +fbsd/profile.bashrc: diff --git a/profiles/default/bsd/fbsd/profile.bashrc b/profiles/default/bsd/fbsd/profile.bashrc index 4c9d5b96abc1..01688c8397bd 100644 --- a/profiles/default/bsd/fbsd/profile.bashrc +++ b/profiles/default/bsd/fbsd/profile.bashrc @@ -1,4 +1,20 @@ +#!/bin/bash +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc,v 1.2 2009/01/24 21:58:18 the_paya Exp $ + alias make=gmake alias patch=gpatch alias sed=gsed alias awk=gawk + +# Hack to avoid every package that uses libiconv/gettext +# install a charset.alias that will collide with libiconv's one +# See bugs 169678, 195148 and 256129. +# Also the discussion on +# http://archives.gentoo.org/gentoo-dev/msg_8cb1805411f37b4eb168a3e680e531f3.xml +post_src_install() +{ + if [[ "${PN}" != "libiconv" && -e "${D}"/usr/lib/charset.alias ]] ; then + rm -f "${D}"/usr/lib/charset.alias + fi +} |