diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2007-01-04 20:38:16 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2007-01-04 20:38:16 +0000 |
| commit | a1243c8c1a7c078eb07ce050852a4873eb71e6cb (patch) | |
| tree | d215af037a4660eb35a6f959ff05eb53fd09415e /eclass/mysql_fx.eclass | |
| parent | Stable on amd64 wrt bug #159980 (diff) | |
| download | historical-a1243c8c1a7c078eb07ce050852a4873eb71e6cb.tar.gz historical-a1243c8c1a7c078eb07ce050852a4873eb71e6cb.tar.bz2 historical-a1243c8c1a7c078eb07ce050852a4873eb71e6cb.zip | |
MY_EXTRAS_VER in ebuilds, bug #159973, bug #160023
Diffstat (limited to 'eclass/mysql_fx.eclass')
| -rw-r--r-- | eclass/mysql_fx.eclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index 50283f1f72e0..457fdd5d19e9 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.16 2007/01/03 15:27:13 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.17 2007/01/04 20:38:16 vivo Exp $ # kate: encoding utf-8; eol unix; # kate: indent-width 4; mixedindent off; remove-trailing-space on; space-indent off; # kate: word-wrap-column 80; word-wrap off; @@ -175,8 +175,9 @@ mysql_choose_better_version() { # 2005-12-30 <vivo at gentoo.org> # THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced mysql_lib_symlinks() { - local d dirlist maxdots soname sonameln other better - pushd "${ROOT}/usr/$(get_libdir)" &> /dev/null + local d dirlist maxdots soname sonameln reldir + reldir=${1} + pushd "${ROOT}${reldir}/usr/$(get_libdir)" &> /dev/null # dirlist must contain the less significative directory left dirlist="mysql $( mysql_make_file_list mysql )" @@ -201,7 +202,10 @@ mysql_lib_symlinks() { done done popd &> /dev/null +} +mysql_clients_link_to_best_version() { + local other better # "include"s and "mysql_config", needed to compile other sw for other in "/usr/$(get_libdir)/mysql" "/usr/include/mysql" "/usr/bin/mysql_config" ; do pushd "${ROOT}${other%/*}" &> /dev/null @@ -215,4 +219,4 @@ mysql_lib_symlinks() { fi popd &> /dev/null done -} +}
\ No newline at end of file |