/[gentoo-x86]/eclass/mysql_fx.eclass
Gentoo

Diff of /eclass/mysql_fx.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.9 Revision 1.10
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.9 2006/03/10 11:41:39 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.10 2006/03/10 12:29:44 herbs Exp $
4 4
5# Author: Francesco Riosa <vivo at gentoo.org> 5# Author: Francesco Riosa <vivo at gentoo.org>
6# Maintainer: Francesco Riosa <vivo at gentoo.org> 6# Maintainer: Francesco Riosa <vivo at gentoo.org>
7
8inherit multilib
7 9
8# helper function, version (integer) may have section separated by dots 10# helper function, version (integer) may have section separated by dots
9# for readbility 11# for readbility
10stripdots() { 12stripdots() {
11 local dotver=${1:-"0"} 13 local dotver=${1:-"0"}
151# library to the best version avaiable 153# library to the best version avaiable
152# 2005-12-30 <vivo at gentoo.org> 154# 2005-12-30 <vivo at gentoo.org>
153# THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced 155# THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced
154mysql_lib_symlinks() { 156mysql_lib_symlinks() {
155 local d dirlist maxdots soname sonameln other better 157 local d dirlist maxdots soname sonameln other better
156 pushd "${ROOT}/usr/lib" &> /dev/null 158 pushd "${ROOT}/usr/$(get_libdir)" &> /dev/null
157 # dirlist must contain the less significative directory left 159 # dirlist must contain the less significative directory left
158 dirlist="mysql $( mysql_make_file_list mysql )" 160 dirlist="mysql $( mysql_make_file_list mysql )"
159 161
160 # waste some time in removing and recreating symlinks 162 # waste some time in removing and recreating symlinks
161 for d in $dirlist ; do 163 for d in $dirlist ; do
177 done 179 done
178 done 180 done
179 popd &> /dev/null 181 popd &> /dev/null
180 182
181 # "include"s and "mysql_config", needed to compile other sw 183 # "include"s and "mysql_config", needed to compile other sw
182 for other in "/usr/lib/mysql" "/usr/include/mysql" "/usr/bin/mysql_config" ; do 184 for other in "/usr/$(get_libdir)/mysql" "/usr/include/mysql" "/usr/bin/mysql_config" ; do
183 pushd "${ROOT}${other%/*}" &> /dev/null 185 pushd "${ROOT}${other%/*}" &> /dev/null
184 better=$( mysql_choose_better_version "${other##*/}" ) 186 better=$( mysql_choose_better_version "${other##*/}" )
185 if ! [[ -d "${other##*/}" ]] ; then 187 if ! [[ -d "${other##*/}" ]] ; then
186 [[ -L "${other##*/}" ]] && rm -f "${other##*/}" 188 [[ -L "${other##*/}" ]] && rm -f "${other##*/}"
187 ! [[ -f "${other##*/}" ]] && ln -sf "${better}" "${other##*/}" 189 ! [[ -f "${other##*/}" ]] && ln -sf "${better}" "${other##*/}"

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

  ViewVC Help
Powered by ViewVC 1.1.20