* [gentoo-commits] gentoo-x86 commit in eclass: mysql-cmake.eclass
@ 2011-12-27 7:34 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-12-27 7:34 UTC (permalink / raw
To: gentoo-commits
robbat2 11/12/27 07:34:18
Modified: mysql-cmake.eclass
Log:
Refactor USE=static cmake code.
Revision Changes Path
1.3 eclass/mysql-cmake.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.2&r2=1.3
Index: mysql-cmake.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- mysql-cmake.eclass 30 Sep 2011 02:10:24 -0000 1.2
+++ mysql-cmake.eclass 27 Dec 2011 07:34:18 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.2 2011/09/30 02:10:24 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.3 2011/12/27 07:34:18 robbat2 Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -123,13 +123,8 @@ configure_cmake_standard() {
-DWITHOUT_LIBWRAP=1
)
- if use static ; then
- mycmakeargs+=( -DDISABLE_SHARED=1 )
- else
- mycmakeargs+=( -DDISABLED_SHARED=0 )
- fi
-
mycmakeargs+=(
+ $(cmake-utils_use_disable !static SHARED)
$(cmake-utils_use_with debug)
$(cmake-utils_use_with embedded EMBEDDED_SERVER)
$(cmake-utils_use_with profiling)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql-cmake.eclass
@ 2013-01-20 2:30 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-01-20 2:30 UTC (permalink / raw
To: gentoo-commits
robbat2 13/01/20 02:30:28
Modified: mysql-cmake.eclass
Log:
Bug #430820: Prefix fix.
Revision Changes Path
1.12 eclass/mysql-cmake.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.11&r2=1.12
Index: mysql-cmake.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -p -w -b -B -u -u -r1.11 -r1.12
--- mysql-cmake.eclass 20 Jan 2013 02:23:10 -0000 1.11
+++ mysql-cmake.eclass 20 Jan 2013 02:30:28 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.11 2013/01/20 02:23:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.12 2013/01/20 02:30:28 robbat2 Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -335,7 +335,7 @@ mysql-cmake_src_install() {
5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;;
esac
einfo "Building default my.cnf (${mysql_mycnf_version})"
- insinto "${MY_SYSCONFDIR}"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
doins scripts/mysqlaccess.conf
mycnf_src="my.cnf-${mysql_mycnf_version}"
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql-cmake.eclass
@ 2013-01-20 2:37 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-01-20 2:37 UTC (permalink / raw
To: gentoo-commits
robbat2 13/01/20 02:37:51
Modified: mysql-cmake.eclass
Log:
Bug #430836: eprefix paths in my.cnf.
Revision Changes Path
1.13 eclass/mysql-cmake.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.12&r2=1.13
Index: mysql-cmake.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -p -w -b -B -u -u -r1.12 -r1.13
--- mysql-cmake.eclass 20 Jan 2013 02:30:28 -0000 1.12
+++ mysql-cmake.eclass 20 Jan 2013 02:37:51 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.12 2013/01/20 02:30:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.13 2013/01/20 02:37:51 robbat2 Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -15,7 +15,7 @@
# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
-inherit cmake-utils flag-o-matic multilib
+inherit cmake-utils flag-o-matic multilib prefix
#
# HELPER FUNCTIONS:
@@ -346,6 +346,7 @@ mysql-cmake_src_install() {
-e "/character-set/s|utf8|latin1|g" \
"${TMPDIR}/my.cnf.ok"
fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
newins "${TMPDIR}/my.cnf.ok" my.cnf
# Minimal builds don't have the MySQL server
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql-cmake.eclass
@ 2013-06-27 17:23 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 4+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2013-06-27 17:23 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 13/06/27 17:23:33
Modified: mysql-cmake.eclass
Log:
[eclass] Add env file to add /usr/lib/mysql to LDPATH. Fixes bug 474952.
Revision Changes Path
1.17 eclass/mysql-cmake.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.16&r2=1.17
Index: mysql-cmake.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mysql-cmake.eclass 26 Jun 2013 19:31:49 -0000 1.16
+++ mysql-cmake.eclass 27 Jun 2013 17:23:33 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.16 2013/06/26 19:31:49 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.17 2013/06/27 17:23:33 jmbsvicetto Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -407,6 +407,11 @@
done
fi
+ cat <<-EOF > "${T}"/80mysql-libdir
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
+ EOF
+ doenvd "${T}"/80mysql-libdir
+
#Remove mytop if perl is not selected
[[ ${PN} == "mariadb" ]] && ! use perl \
&& rm -f "${ED}/usr/bin/mytop"
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-27 17:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-20 2:37 [gentoo-commits] gentoo-x86 commit in eclass: mysql-cmake.eclass Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2013-06-27 17:23 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2013-01-20 2:30 Robin H. Johnson (robbat2)
2011-12-27 7:34 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox