-
Bug
-
Resolution: Fixed
-
Normal
-
None
-
None
-
None
-
coffnix ~ # emerge --info
Portage 2.3.24 (python 3.4.6-final-0, funtoo/1.0/linux-gnu/arch/x86-64bit, gcc-6.4.0, glibc-2.23-r8, 4.9.82-1+deb9u3 x86_64)
=================================================================
System uname: Linux-4.9.82-1+deb9u3-x86_64-Intel-R-Xeon-R-_CPU_E7-_4870@_2.40GHz-with-gentoo-2.2.2
KiB Mem: 4194304 total, 159824 free
KiB Swap: 134217724 total, 130384844 free
sh bash 4.4_p18
ld GNU ld (Gentoo 2.28 p1.2) 2.28
app-shells/bash: 4.4_p18::core-kit
dev-lang/perl: 5.24.0-r3::perl-kit
dev-lang/python: 2.7.14-r2::python-kit, 3.4.6-r1::python-kit
dev-util/cmake: 3.8.0::core-kit
sys-apps/baselayout: 2.2.2::core-kit
sys-apps/openrc: 0.35.0_beta1-r1::core-kit
sys-apps/sandbox: 2.10-r4::core-kit
sys-devel/autoconf: 2.69-r2::core-kit
sys-devel/automake: 1.13.4-r2::core-kit, 1.14.1-r2::core-kit, 1.15.1-r2::core-kit
sys-devel/binutils: 2.25-r2::gentoo, 2.28-r4::core-kit, 2.29.1-r1::core-kit
sys-devel/gcc: 4.9.3-r3::gentoo, 5.3.0-r1::gentoo, 5.4.0-r1::core-kit, 6.4.0::core-kit
sys-devel/gcc-config: 1.8-r1::core-kit
sys-devel/libtool: 2.4.6-r4::core-kit
sys-devel/make: 4.1-r1::core-kit
sys-kernel/linux-headers: 4.9::core-kit (virtual/os-headers)
sys-libs/glibc: 2.23-r8::core-kit
Repositories:nokit
location: /var/git/meta-repo/kits/nokit
masters: core-kit
priority: -500coffnix-ebuilds
location: /var/overlay/local
masters: core-kit
priority: 0core-hw-kit
location: /var/git/meta-repo/kits/core-hw-kit
masters: core-kit
priority: 1core-kit
location: /var/git/meta-repo/kits/core-kit
masters: core-kit
priority: 1
aliases: gentoodesktop-kit
location: /var/git/meta-repo/kits/desktop-kit
masters: core-kit
priority: 1dev-kit
location: /var/git/meta-repo/kits/dev-kit
masters: core-kit
priority: 1editors-kit
location: /var/git/meta-repo/kits/editors-kit
masters: core-kit
priority: 1games-kit
location: /var/git/meta-repo/kits/games-kit
masters: core-kit
priority: 1haskell-kit
location: /var/git/meta-repo/kits/haskell-kit
masters: core-kit
priority: 1hiro-oops-intern
location: /var/overlay/gentoo-overlay
masters: core-kit
priority: 1java-kit
location: /var/git/meta-repo/kits/java-kit
masters: core-kit
priority: 1kde-kit
location: /var/git/meta-repo/kits/kde-kit
masters: core-kit
priority: 1lang-kit
location: /var/git/meta-repo/kits/lang-kit
masters: core-kit
priority: 1lisp-scheme-kit
location: /var/git/meta-repo/kits/lisp-scheme-kit
masters: core-kit
priority: 1llvm-kit
location: /var/git/meta-repo/kits/llvm-kit
masters: core-kit
priority: 1media-kit
location: /var/git/meta-repo/kits/media-kit
masters: core-kit
priority: 1ml-lang-kit
location: /var/git/meta-repo/kits/ml-lang-kit
masters: core-kit
priority: 1net-kit
location: /var/git/meta-repo/kits/net-kit
masters: core-kit
priority: 1perl-kit
location: /var/git/meta-repo/kits/perl-kit
masters: core-kit
priority: 1php-kit
location: /var/git/meta-repo/kits/php-kit
masters: core-kit
priority: 1python-kit
location: /var/git/meta-repo/kits/python-kit
masters: core-kit
priority: 1ruby-kit
location: /var/git/meta-repo/kits/ruby-kit
masters: core-kit
priority: 1security-kit
location: /var/git/meta-repo/kits/security-kit
masters: core-kit
priority: 1text-kit
location: /var/git/meta-repo/kits/text-kit
masters: core-kit
priority: 1xfce-kit
location: /var/git/meta-repo/kits/xfce-kit
masters: core-kit
priority: 1xorg-kit
location: /var/git/meta-repo/kits/xorg-kit
masters: core-kit
priority: 1gnome-kit
location: /var/git/meta-repo/kits/gnome-kit
masters: core-kit
priority: 10science-kit
location: /var/git/meta-repo/kits/science-kit
masters: core-kit
priority: 10ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=corei7 -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/easy-rsa /usr/share/gnupg/qualified.txt /var/bind"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apach
e2-php7.0/ext-active/ /etc/php/apache2-php7.1/ext-active/ /etc/php/apache2-php7.2/ext-active/ /etc/php/cgi-php7.0/ext-active/
/etc/php/cgi-php7.1/ext-active/ /etc/php/cgi-php7.2/ext-active/ /etc/php/cli-php7.0/ext-active/ /etc/php/cli-php7.1/ext-acti
ve/ /etc/php/cli-php7.2/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=corei7 -O2 -pipe"
DISTDIR="/var/cache/portage/distfiles"
FEATURES="assume-digests binpkg-logs buildpkg config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync multili
b-strict news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-or
phans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-march=westmere -O2 -pipe"
GENTOO_MIRRORS="https://fastpull-us.funtoo.org"
INSTALL_MASK="/etc/systemd/ /usr/lib/systemd/ /lib/systemd/"
LANG="en_US.UTF-8"
LC_ALL="en_US.UTF-8"
LDFLAGS="Wl,-O1 -Wl,sort-common -Wl,-as-needed"
LINGUAS="pt_BR"
MAKEOPTS="-j3"
PKGDIR="/var/src/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_TMPDIR="/var/tmp"
USE="acl amd64 apache bash-completion berkdb bzip2 caps clamav cluster command-args cracklib crypt curl cxx dlz gdbm geoip ht
tp2 iconv icu idn ipv6 jit kmod ldap lua mmx modules mudflap multilib ncurses netlink nls nptl nss objc openipmi openssl open
vz pam pcre perl png python python_abis_2.6 python_abis_2.7 python_abis_3.2 python_abis_3.4 readline resolvconf sasl smi snmp
spdy sse sse2 ssl syslog tcl tcpd threads truetype tty-helpers unicode urandom vim-syntax xattr xml zlib" ABI_X86="64" APACH
E2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_
groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires e
xt_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif spel
ing status unique_id userdir usertrack vhost_alias authn_core authz_core socache_shmcb unixd" CALLIGRA_FEATURES="kexi words f
low plan sheets stage tables krita karbon braindump author" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslo
g" CPU_FLAGS_X86="aes mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthm
ate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm1
04v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64 pc" INPUT_DEVICES="evdev synaptics ke
yboard mouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_
EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="pt_BR" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-6" P
OSTGRES_TARGETS="postgres9_5" PYTHON_SINGLE_TARGET="python3_4" PYTHON_TARGETS="python2_6 python2_7 python3_4" QEMU_SOFTMMU_TA
RGETS="i386 x86_64" QEMU_USER_TARGETS="i386 x86_64" RUBY_TARGETS="ruby22 ruby23 ruby24" USERLAND="GNU" XTABLES_ADDONS="quota2
psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dh
cpmac delude chaos account"
Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, ENV_UNSET, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGScoffnix ~ # emerge --info Portage 2.3.24 (python 3.4.6-final-0, funtoo/1.0/linux-gnu/arch/x86-64bit, gcc-6.4.0, glibc-2.23-r8, 4.9.82-1+deb9u3 x86_64) ================================================================= System uname: Linux-4.9.82-1+deb9u3-x86_64-Intel-R- Xeon-R-_CPU_E7-_4870 @_2.40GHz-with-gentoo-2.2.2 KiB Mem: 4194304 total, 159824 free KiB Swap: 134217724 total, 130384844 free sh bash 4.4_p18 ld GNU ld (Gentoo 2.28 p1.2) 2.28 app-shells/bash: 4.4_p18::core-kit dev-lang/perl: 5.24.0-r3::perl-kit dev-lang/python: 2.7.14-r2::python-kit, 3.4.6-r1::python-kit dev-util/cmake: 3.8.0::core-kit sys-apps/baselayout: 2.2.2::core-kit sys-apps/openrc: 0.35.0_beta1-r1::core-kit sys-apps/sandbox: 2.10-r4::core-kit sys-devel/autoconf: 2.69-r2::core-kit sys-devel/automake: 1.13.4-r2::core-kit, 1.14.1-r2::core-kit, 1.15.1-r2::core-kit sys-devel/binutils: 2.25-r2::gentoo, 2.28-r4::core-kit, 2.29.1-r1::core-kit sys-devel/gcc: 4.9.3-r3::gentoo, 5.3.0-r1::gentoo, 5.4.0-r1::core-kit, 6.4.0::core-kit sys-devel/gcc-config: 1.8-r1::core-kit sys-devel/libtool: 2.4.6-r4::core-kit sys-devel/make: 4.1-r1::core-kit sys-kernel/linux-headers: 4.9::core-kit (virtual/os-headers) sys-libs/glibc: 2.23-r8::core-kit Repositories: nokit location: /var/git/meta-repo/kits/nokit masters: core-kit priority: -500 coffnix-ebuilds location: /var/overlay/local masters: core-kit priority: 0 core-hw-kit location: /var/git/meta-repo/kits/core-hw-kit masters: core-kit priority: 1 core-kit location: /var/git/meta-repo/kits/core-kit masters: core-kit priority: 1 aliases: gentoo desktop-kit location: /var/git/meta-repo/kits/desktop-kit masters: core-kit priority: 1 dev-kit location: /var/git/meta-repo/kits/dev-kit masters: core-kit priority: 1 editors-kit location: /var/git/meta-repo/kits/editors-kit masters: core-kit priority: 1 games-kit location: /var/git/meta-repo/kits/games-kit masters: core-kit priority: 1 haskell-kit location: /var/git/meta-repo/kits/haskell-kit masters: core-kit priority: 1 hiro-oops-intern location: /var/overlay/gentoo-overlay masters: core-kit priority: 1 java-kit location: /var/git/meta-repo/kits/java-kit masters: core-kit priority: 1 kde-kit location: /var/git/meta-repo/kits/kde-kit masters: core-kit priority: 1 lang-kit location: /var/git/meta-repo/kits/lang-kit masters: core-kit priority: 1 lisp-scheme-kit location: /var/git/meta-repo/kits/lisp-scheme-kit masters: core-kit priority: 1 llvm-kit location: /var/git/meta-repo/kits/llvm-kit masters: core-kit priority: 1 media-kit location: /var/git/meta-repo/kits/media-kit masters: core-kit priority: 1 ml-lang-kit location: /var/git/meta-repo/kits/ml-lang-kit masters: core-kit priority: 1 net-kit location: /var/git/meta-repo/kits/net-kit masters: core-kit priority: 1 perl-kit location: /var/git/meta-repo/kits/perl-kit masters: core-kit priority: 1 php-kit location: /var/git/meta-repo/kits/php-kit masters: core-kit priority: 1 python-kit location: /var/git/meta-repo/kits/python-kit masters: core-kit priority: 1 ruby-kit location: /var/git/meta-repo/kits/ruby-kit masters: core-kit priority: 1 security-kit location: /var/git/meta-repo/kits/security-kit masters: core-kit priority: 1 text-kit location: /var/git/meta-repo/kits/text-kit masters: core-kit priority: 1 xfce-kit location: /var/git/meta-repo/kits/xfce-kit masters: core-kit priority: 1 xorg-kit location: /var/git/meta-repo/kits/xorg-kit masters: core-kit priority: 1 gnome-kit location: /var/git/meta-repo/kits/gnome-kit masters: core-kit priority: 10 science-kit location: /var/git/meta-repo/kits/science-kit masters: core-kit priority: 10 ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="*" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=corei7 -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/easy-rsa /usr/share/gnupg/qualified.txt /var/bind" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apach e2-php7.0/ext-active/ /etc/php/apache2-php7.1/ext-active/ /etc/php/apache2-php7.2/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/cgi-php7.1/ext-active/ /etc/php/cgi-php7.2/ext-active/ /etc/php/cli-php7.0/ext-active/ /etc/php/cli-php7.1/ext-acti ve/ /etc/php/cli-php7.2/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-march=corei7 -O2 -pipe" DISTDIR="/var/cache/portage/distfiles" FEATURES="assume-digests binpkg-logs buildpkg config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync multili b-strict news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-or phans userfetch userpriv usersandbox usersync xattr" FFLAGS="-march=westmere -O2 -pipe" GENTOO_MIRRORS="https://fastpull-us.funtoo.org" INSTALL_MASK="/etc/systemd/ /usr/lib/systemd/ /lib/systemd/" LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" LDFLAGS=" Wl,-O1 -Wl, sort-common -Wl, -as-needed" LINGUAS="pt_BR" MAKEOPTS="-j3" PKGDIR="/var/src/packages" PORTAGE_CONFIGROOT="/" PORTAGE_TMPDIR="/var/tmp" USE="acl amd64 apache bash-completion berkdb bzip2 caps clamav cluster command-args cracklib crypt curl cxx dlz gdbm geoip ht tp2 iconv icu idn ipv6 jit kmod ldap lua mmx modules mudflap multilib ncurses netlink nls nptl nss objc openipmi openssl open vz pam pcre perl png python python_abis_2.6 python_abis_2.7 python_abis_3.2 python_abis_3.4 readline resolvconf sasl smi snmp spdy sse sse2 ssl syslog tcl tcpd threads truetype tty-helpers unicode urandom vim-syntax xattr xml zlib" ABI_X86="64" APACH E2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_ groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires e xt_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif spel ing status unique_id userdir usertrack vhost_alias authn_core authz_core socache_shmcb unixd" CALLIGRA_FEATURES="kexi words f low plan sheets stage tables krita karbon braindump author" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslo g" CPU_FLAGS_X86="aes mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthm ate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm1 04v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64 pc" INPUT_DEVICES="evdev synaptics ke yboard mouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_ EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="pt_BR" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-6" P OSTGRES_TARGETS="postgres9_5" PYTHON_SINGLE_TARGET="python3_4" PYTHON_TARGETS="python2_6 python2_7 python3_4" QEMU_SOFTMMU_TA RGETS="i386 x86_64" QEMU_USER_TARGETS="i386 x86_64" RUBY_TARGETS="ruby22 ruby23 ruby24" USERLAND="GNU" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dh cpmac delude chaos account" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, ENV_UNSET, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS
Version =dev-db/mariadb-10.2.12 compile fine. New versions fail to emerge:
###################################################################
coffnix ~ # emerge =dev-db/mariadb-10.2.14
Calculating dependencies... done!
[ebuild U ] dev-db/mariadb-10.2.14 [10.2.12] USE="-client-libs%"
[ebuild N ] dev-db/mariadb-connector-c-3.0.3 USE="curl ssl -gnutls -kerberos -libressl -mysqlcompat -static-libs" ABI_X
86="(64) -32 (-x32)"
[ebuild N ] dev-db/mysql-connector-c-6.1.9-r1 USE="ssl -static-libs" ABI_X86="(64) -32 (-x32)"
[ebuild N ] dev-db/mysql-5.6.39 USE="latin1 openssl perl server -debug -embedded -extraengine -jemalloc -libressl -numa
-profiling (-selinux) -static -static-libs -systemtap -tcmalloc {-test} -yassl" ABI_X86="(64) -32 (-x32)"
[blocks B ] dev-db/mysql[client-libs(+)] ("dev-db/mysql[client-libs(+)]" is blocking dev-db/mysql-connector-c-6.1.9-r1)
[blocks B ] dev-db/mysql ("dev-db/mysql" is blocking dev-db/mariadb-10.2.12, dev-db/mariadb-10.2.14)
[blocks B ] dev-db/mariadb ("dev-db/mariadb" is blocking dev-db/mysql-5.6.39)
- Error: The above package list contains packages which cannot be
- installed at the same time on the same system.
dev-db/mysql-5.6.39:0/18::dev-kit, ebuild scheduled for merge pulled in by
=dev-db/mysql-5.6*[embedded?,server?,static?] (=dev-db/mysql-5.6*[server]) required by virtual/mysql-5.6-r9:0/18::dev-kit
, installed
dev-db/mariadb-10.2.14:0/18::dev-kit, ebuild scheduled for merge pulled in by
dev-db/mariadb required by @selected
=dev-db/mariadb-10.2.14
dev-db/mysql-connector-c-6.1.9-r1:0/18::dev-kit, ebuild scheduled for merge pulled in by
dev-db/mysql-connector-c:0/18[static-libs?,abi_x86_32?,abi_x86_64?,abi_x86_x32?,abi_mips_n32?,abi_mips_n64
?,abi_mips_o32?,abi_ppc_32?,abi_ppc_64?,abi_s390_32?,abi_s390_64?] (dev-db/mysql-connector-c:0/18[abi_x86_64(-
)]) required by virtual/libmysqlclient-18:0/18::dev-kit, installed
dev-db/mysql-connector-c[abi_x86_32?,abi_x86_64?,abi_x86_x32?,abi_mips_n32?,abi_mips_n64?,abi_mips_o32?
,abi_ppc_32?,abi_ppc_64?,abi_s390_32?,abi_s390_64?] (dev-db/mysql-connector-c[abi_x86_64(-)]) required by dev-db/
mariadb-10.2.14:0/18::dev-kit, ebuild scheduled for merge
###################################################################
coffnix /var/overlay/local/dev-db/mariadb # diff -u /var/overlay/local/dev-db/mariadb/mariadb-10.2.12.ebuild /var/git/meta-re
po/kits/dev-kit/dev-db/mariadb/mariadb-10.2.14.ebuild
— /var/overlay/local/dev-db/mariadb/mariadb-10.2.12.ebuild 2018-04-05 12:41:31.704602982 -0300
+++ /var/git/meta-repo/kits/dev-kit/dev-db/mariadb/mariadb-10.2.14.ebuild 2018-05-08 17:00:21.930449188 -0300
@@ -2,7 +2,7 @@
- Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="20170926-1321Z"
+MY_EXTRAS_VER="20180308-1938Z"
SUBSLOT="18"
JAVA_PKG_OPT_USE="jdbc"
@@ -28,7 +28,7 @@
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc
@@ -39,12 +39,11 @@
REQUIRED_USE="jdbc? ( extraengine server !static )
server? ( tokudb? ( jemalloc !tcmalloc ) )
- !server? ( !extraengine !embedded )
+ !server? ( !extraengine )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
- REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~p
pc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-
solaris"
- REMEMBER: also update eclass/mysql*.eclass before committing!
- Shorten the path because the socket path length must be shorter than 107 chars
- and we will run a mysql server during test phase
@@ -58,7 +57,7 @@
PATCHES=(
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
)
@@ -73,18 +72,24 @@
)
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1 - !dev-db/mariadb-connector-c[mysqlcompat]
jemalloc? ( dev-libs/jemalloc:0= )
tcmalloc? ( dev-util/google-perftools:0= )
systemtap? ( >=dev-util/systemtap-1.3:0= )
!yassl? ( - !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ client-libs? (
+ !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ )
+ !client-libs? (
+ !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
) - >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+ client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ )
+ !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) )
sys-libs/ncurses:0= - mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -99,6 +104,7 @@
innodb-lz4? ( app-arch/lz4 )
innodb-lzo? ( dev-libs/lzo )
innodb-snappy? ( app-arch/snappy )
+ mroonga? ( app-text/groonga-normalizer-mysql )
numa? ( sys-process/numactl )
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( virtual/pam:0= )
@@ -113,7 +119,7 @@
server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
${COMMON_DEPEND}"
RDEPEND="selinux? ( sec-policy/selinux-mysql ) - abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
+ client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
!<virtual/mysql-5.6-r9
@@ -136,9 +142,9 @@
- dev-perl/DBD-mysql is needed by some scripts installed by MySQL
- xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
- server? ( ~virtual/mysql-5.6[embedded=,static=] )
- virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]
- server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+ !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
+ server? ( ~virtual/mysql-5.6[static=]
+ galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]] ; then
@@ -240,10 +246,6 @@
}
src_unpack() { - # Initialize the proper variables first
- mysql_init_vars
unpack ${A}
# Grab the patches
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
@@ -266,6 +268,10 @@
# There is no CMake flag, it simply checks for existance
rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+ if ! use server; then
+ rm -r "${S}"/plugin/handler_socket || die
+ fi
+
cmake-utils_src_prepare
}
@@ -280,12 +286,20 @@
# bug #283926, with GCC4.4, this is required to get correct behavior.
append-flags -fno-strict-aliasing
- multilib-minimal_src_configure
+ if use client-libs ; then
+ multilib-minimal_src_configure
+ else
+ multilib_src_configure
+ fi
}
multilib_src_configure() {
debug-print-function ${FUNCNAME} "$@"
+ if ! multilib_is_native_abi && ! use client-libs ; then
+ return
+ fi
+
CMAKE_BUILD_TYPE="RelWithDebInfo"
# debug hack wrt #497532
@@ -343,6 +357,10 @@
mycmakeargs+=( -DWITH_SSL=bundled )
fi
+ if ! use client-libs ; then
+ mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+ fi
+
# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
# systemtap only works on native ABI bug 530132
if multilib_is_native_abi; then
@@ -436,7 +454,7 @@
-DMYSQL_USER=mysql
-DDISABLE_SHARED=$(usex static YES NO)
-DWITH_DEBUG=$(usex debug) - -DWITH_EMBEDDED_SERVER=$(usex embedded)
+ -DWITH_EMBEDDED_SERVER=OFF
-DWITH_PROFILING=$(usex profiling)
)
@@ -463,7 +481,7 @@
else
mycmakeargs+=(
-DWITHOUT_SERVER=1 - -DWITHOUT_EMBEDDED_SERVER=1
+ -DWITH_EMBEDDED_SERVER=OFF
-DEXTRA_CHARSETS=none
-DINSTALL_SQLBENCHDIR=
-DWITH_SYSTEMD=no
@@ -474,7 +492,11 @@
}
src_compile() { - multilib-minimal_src_compile + if use client-libs ; then + multilib-minimal_src_compile + else + multilib_src_compile + fi }
multilib_src_compile()
src_install()
- Intentionally override eclass function
multilib_src_install() {
- cmake-utils_src_install
- # Make sure the vars are correctly initialized
- mysql_init_vars
+ cmake-utils_src_install
# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
- rm "${D}/usr/include/mysql/server/private/config.h" || die
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
fi
if ! multilib_is_native_abi && use server ; then
@@ -514,10 +541,12 @@
doins "${S}"/sql/*.h
fi
+ if use client-libs ; then
# Install compatible symlinks to libmysqlclient- use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+# use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+# dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+ dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+ fi
# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
@@ -598,12 +627,7 @@
- FEATURES='test userpriv -usersandbox' \
- ebuild mariadb-X.X.XX.ebuild \
- digest clean package
-multilib_src_test() {
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
+src_test() {
_disable_test() {
local rawtestname reason
@@ -668,6 +692,10 @@
_disable_test "$t" "False positives in Gentoo"
done
+ if ! use client-libs ; then
+ _disable_test main.plugin_auth "Needs client libraries built"
+ fi
+
# run mysql-test tests
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled
.def"
retstatus_tests=$?
@@ -818,11 +846,11 @@
unset tmp_mysqld_password_source
fi - MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
# These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then