From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QmclL-0003A8-61 for garchives@archives.gentoo.org; Fri, 29 Jul 2011 02:25:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9213A21C04D; Fri, 29 Jul 2011 02:25:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5F8A721C04D for ; Fri, 29 Jul 2011 02:25:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC08C1B401A for ; Fri, 29 Jul 2011 02:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 387F38003D for ; Fri, 29 Jul 2011 02:25:08 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <8d3e6216d5a32a14c0fe5618b1cf6c8c2d499a0d.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql_fx.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 8d3e6216d5a32a14c0fe5618b1cf6c8c2d499a0d Date: Fri, 29 Jul 2011 02:25:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: fd15d745b34fe5fa52a492bc4648edad commit: 8d3e6216d5a32a14c0fe5618b1cf6c8c2d499a0d Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Fri Jul 29 02:24:13 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Fri Jul 29 02:24:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D8d3e6216 [eclass/mysql_fx] Set include and lib dirs to usr/*/mysql - new break rep= orted on bug 375063. --- eclass/mysql_fx.eclass | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index c3d7c09..fa7376c 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -229,13 +229,8 @@ mysql_init_vars() { MY_SYSCONFDIR=3D${MY_SYSCONFDIR=3D"/etc/mysql"} MY_LOCALSTATEDIR=3D${MY_LOCALSTATEDIR=3D"/var/lib/mysql"} MY_LOGDIR=3D${MY_LOGDIR=3D"/var/log/mysql"} - if [[ ${PN} =3D=3D "mariadb" ]]; then - MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include/mysql"} - MY_LIBDIR=3D${MY_LIBDIR=3D"/usr/$(get_libdir)/mysql"} - else - MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include"} - MY_LIBDIR=3D${MY_LIBDIR=3D"/usr/$(get_libdir)"} - fi + MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include/mysql"} + MY_LIBDIR=3D${MY_LIBDIR=3D"/usr/$(get_libdir)/mysql"} =20 if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR=3D""