* [gentoo-commits] proj/mysql:split-client commit in: eclass/
@ 2015-07-07 15:08 Brian Evans
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans @ 2015-07-07 15:08 UTC (permalink / raw
To: gentoo-commits
commit: ea6e35d0e7f38d5023bbd3e3282502ea7f620697
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 15:11:21 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 15:11:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ea6e35d0
Always build the command line tools
eclass/mysql-cmake.eclass | 12 +++++-------
eclass/mysql-multilib.eclass | 31 +++++++++++--------------------
2 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 55babbc..0d0a1be 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -428,13 +428,11 @@ mysql-cmake_src_install() {
cmake-utils_src_install
- if ! in_iuse tools || use_if_iuse tools ; then
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
- fi
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
if [[ -z ${HAS_TOOLS_PATCH} ]] ; then
# Create a mariadb_config symlink
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a786828..2a37bcc 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -237,8 +237,8 @@ if [[ ${PN} == "percona-server" ]]; then
fi
if [[ ${HAS_TOOLS_PATCH} ]] ; then
- IUSE="${IUSE} client-libs +server +tools"
- REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) server? ( tools ) || ( client-libs server tools )"
+ IUSE="${IUSE} client-libs +server"
+ REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) || ( client-libs server )"
else
IUSE="${IUSE} minimal"
REQUIRED_USE="${REQUIRED_USE} minimal? ( !extraengine !embedded )"
@@ -261,6 +261,7 @@ DEPEND="
sys-process/procps:0=
dev-libs/libaio:0=
)
+ sys-libs/ncurses
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
@@ -270,12 +271,6 @@ DEPEND="
systemtap? ( >=dev-util/systemtap-1.3:0= )
"
-if [[ ${HAS_TOOLS_PATCH} ]] ; then
- DEPEND="${DEPEND} tools? ( sys-libs/ncurses ) embedded? ( sys-libs/ncurses )"
-else
- DEPEND="${DEPEND} sys-libs/ncurses"
-fi
-
### Begin readline/libedit
### If the world was perfect, we would use external libedit on both to have a similar experience
### However libedit does not seem to support UTF-8 keyboard input
@@ -298,7 +293,7 @@ fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
# Readline is only used for the command-line and embedded example
if [[ ${HAS_TOOLS_PATCH} ]] ; then
- DEPEND="${DEPEND} !bindist? ( tools? ( >=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= ) )"
+ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0= )"
else
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
fi
@@ -427,7 +422,7 @@ DEPEND="${DEPEND}
>=dev-util/cmake-2.8.9
"
-# Transition dep until all ebuilds have tools USE
+# Transition dep until all ebuilds have client-libs patch and USE
if ! [[ ${HAS_TOOLS_PATCH} ]] ; then
DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]"
fi
@@ -612,11 +607,9 @@ multilib_src_configure() {
if in_iuse client-libs ; then
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
- fi
- if in_iuse tools ; then
if multilib_is_native_abi ; then
- mycmakeargs+=( -DWITHOUT_TOOLS=$(usex tools 0 1) )
+ mycmakeargs+=( -DWITHOUT_TOOLS=0 )
else
mycmakeargs+=( -DWITHOUT_TOOLS=1 )
fi
@@ -629,13 +622,11 @@ multilib_src_configure() {
-DWITH_READLINE=$(usex bindist 1 0)
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
)
- else
- if ! in_iuse tools ; then
- mycmakeargs+=(
- -DWITH_READLINE=1
- -DNOT_FOR_DISTRIBUTION=0
- )
- fi
+ elif ! in_iuse client-libs ; then
+ mycmakeargs+=(
+ -DWITH_READLINE=1
+ -DNOT_FOR_DISTRIBUTION=0
+ )
fi
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/mysql:split-client commit in: eclass/
@ 2015-07-07 19:24 Brian Evans
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans @ 2015-07-07 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 6c177253fc4536b0eafee6310799c1c4b11aa287
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 19:15:05 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 19:15:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6c177253
Refine dependencies and skip multilib when -client-libs
eclass/mysql-multilib.eclass | 59 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 50 insertions(+), 9 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 2a37bcc..bfee72c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -256,7 +256,6 @@ REQUIRED_USE="
# These are used for both runtime and compiletime
# MULTILIB_USEDEP only set for libraries used by the client library
DEPEND="
- ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
kernel_linux? (
sys-process/procps:0=
dev-libs/libaio:0=
@@ -264,13 +263,30 @@ DEPEND="
sys-libs/ncurses
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
- >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
!dev-db/mariadb-native-client[mysqlcompat]
- jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] )
+ jemalloc? ( dev-libs/jemalloc:0= )
tcmalloc? ( dev-util/google-perftools:0= )
systemtap? ( >=dev-util/systemtap-1.3:0= )
"
+if [[ ${HAS_TOOLS_PATCH} ]] ; then
+ DEPEND+="
+ client-libs? (
+ ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+ )
+ !client-libs? (
+ ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
+ >=sys-libs/zlib-1.2.3:0=[static-libs?]
+ )
+ "
+else
+ DEPEND+="
+ ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+ "
+fi
+
### Begin readline/libedit
### If the world was perfect, we would use external libedit on both to have a similar experience
### However libedit does not seem to support UTF-8 keyboard input
@@ -326,7 +342,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
"
fi
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
- mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]"
+ mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
mysql_version_is_at_least "10.1.1" && DEPEND="${DEPEND}
innodb-lz4? ( app-arch/lz4 )
@@ -562,6 +578,13 @@ multilib_src_configure() {
CMAKE_BUILD_TYPE="RelWithDebInfo"
+ if ! multilib_is_native_abi && in_iuse client-libs ; then
+ if ! use client-libs ; then
+ ewarn "Skipping multilib build due to client-libs USE disabled"
+ return 0
+ fi
+ fi
+
# debug hack wrt #497532
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
@@ -608,9 +631,8 @@ multilib_src_configure() {
if in_iuse client-libs ; then
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
- if multilib_is_native_abi ; then
- mycmakeargs+=( -DWITHOUT_TOOLS=0 )
- else
+ # Always build tools on native, but skip when possible on non-native to eliminate multilib dependencies
+ if ! multilib_is_native_abi ; then
mycmakeargs+=( -DWITHOUT_TOOLS=1 )
fi
fi
@@ -633,7 +655,7 @@ multilib_src_configure() {
### TODO: make this system but issues with UTF-8 prevent it
mycmakeargs+=( -DWITH_EDITLINE=bundled )
- if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && multilib_is_native_abi ; then
mycmakeargs+=(
-DWITH_JEMALLOC=$(usex jemalloc system)
)
@@ -666,6 +688,13 @@ mysql-multilib_src_compile() {
}
multilib_src_compile() {
+ if ! multilib_is_native_abi && in_iuse client-libs ; then
+ if ! use client-libs ; then
+ ewarn "Skipping multilib build due to client-libs USE disabled"
+ return 0
+ fi
+ fi
+
cmake-utils_src_compile "${_cmake_args[@]}"
}
@@ -678,12 +707,24 @@ mysql-multilib_src_install() {
# wrap the config script
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
fi
- multilib-minimal_src_install
+
+ if in_iuse client-libs && ! use client-libs ; then
+ multilib_foreach_abi multilib_src_install
+ else
+ multilib-minimal_src_install
+ fi
}
multilib_src_install() {
debug-print-function ${FUNCNAME} "$@"
+ if ! multilib_is_native_abi && in_iuse client-libs ; then
+ if ! use client-libs ; then
+ ewarn "Skipping multilib build due to client-libs USE disabled"
+ return 0
+ fi
+ fi
+
if multilib_is_native_abi; then
mysql-cmake_src_install
else
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/mysql:split-client commit in: eclass/
@ 2015-07-07 19:24 Brian Evans
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans @ 2015-07-07 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 528a139df5fa9efee9257661de7bffec8c121822
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 19:25:26 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 19:25:26 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=528a139d
Revert "Always build the command line tools"
This reverts commit ea6e35d0e7f38d5023bbd3e3282502ea7f620697.
eclass/mysql-cmake.eclass | 12 +++++++-----
eclass/mysql-multilib.eclass | 17 +++++++++++------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 0d0a1be..55babbc 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -428,11 +428,13 @@ mysql-cmake_src_install() {
cmake-utils_src_install
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+ if ! in_iuse tools || use_if_iuse tools ; then
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+ fi
if [[ -z ${HAS_TOOLS_PATCH} ]] ; then
# Create a mariadb_config symlink
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index bfee72c..3e90096 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -237,8 +237,8 @@ if [[ ${PN} == "percona-server" ]]; then
fi
if [[ ${HAS_TOOLS_PATCH} ]] ; then
- IUSE="${IUSE} client-libs +server"
- REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) || ( client-libs server )"
+ IUSE="${IUSE} client-libs +server +tools"
+ REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) server? ( tools ) || ( client-libs server tools )"
else
IUSE="${IUSE} minimal"
REQUIRED_USE="${REQUIRED_USE} minimal? ( !extraengine !embedded )"
@@ -256,11 +256,11 @@ REQUIRED_USE="
# These are used for both runtime and compiletime
# MULTILIB_USEDEP only set for libraries used by the client library
DEPEND="
+ ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
kernel_linux? (
sys-process/procps:0=
dev-libs/libaio:0=
)
- sys-libs/ncurses
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
!dev-db/mariadb-native-client[mysqlcompat]
@@ -279,11 +279,13 @@ if [[ ${HAS_TOOLS_PATCH} ]] ; then
ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
>=sys-libs/zlib-1.2.3:0=[static-libs?]
)
+ tools? ( sys-libs/ncurses ) embedded? ( sys-libs/ncurses )
"
else
DEPEND+="
ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+ sys-libs/ncurses[${MULTILIB_USEDEP}]
"
fi
@@ -309,7 +311,7 @@ fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
# Readline is only used for the command-line and embedded example
if [[ ${HAS_TOOLS_PATCH} ]] ; then
- DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0= )"
+ DEPEND="${DEPEND} !bindist? ( tools? ( >=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= ) )"
else
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
fi
@@ -630,9 +632,12 @@ multilib_src_configure() {
if in_iuse client-libs ; then
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
+ fi
- # Always build tools on native, but skip when possible on non-native to eliminate multilib dependencies
- if ! multilib_is_native_abi ; then
+ if in_iuse tools ; then
+ if multilib_is_native_abi ; then
+ mycmakeargs+=( -DWITHOUT_TOOLS=$(usex tools 0 1) )
+ else
mycmakeargs+=( -DWITHOUT_TOOLS=1 )
fi
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/mysql:split-client commit in: eclass/
@ 2015-07-17 2:51 Brian Evans
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans @ 2015-07-17 2:51 UTC (permalink / raw
To: gentoo-commits
commit: baba3d81e3cd807c453184b8531257cb02de8018
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 02:40:37 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 02:40:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=baba3d81
Fix 10.1 mariadb slotting on virtual/mysql
eclass/mysql-multilib.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 2c1b96e..4385728 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -75,7 +75,7 @@ fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
case ${PV} in
10.0*) MYSQL_PV_MAJOR="5.6" ;;
- 10.1*) MYSQL_PV_MAJOR="5.7" ;;
+ 10.1*) MYSQL_PV_MAJOR="5.6" ;;
esac
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-17 2:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-17 2:51 [gentoo-commits] proj/mysql:split-client commit in: eclass/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2015-07-07 19:24 Brian Evans
2015-07-07 19:24 Brian Evans
2015-07-07 15:08 Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox