gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-db/mariadb: Fix build failures with missing dependencies

Browse Source 
Closes: https://bugs.gentoo.org/656208
Closes: https://bugs.gentoo.org/655172
Package-Manager: Portage-2.3.38, Repoman-2.3.9
This commit is contained in:
Brian Evans
2018-05-21 09:37:18 -04:00
parent ea15db011d
commit b25ad5e7bb
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-db/mariadb/mariadb-10.2.15.ebuild
View File

@@ -80,20 +80,21 @@ COMMON_DEPEND="
jemalloc? ( dev-libs/jemalloc:0= )
tcmalloc? ( dev-util/google-perftools:0= )
systemtap? ( >=dev-util/systemtap-1.3:0= )
!yassl? (
client-libs? (
client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] )
!yassl? (
!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
)
!client-libs? (
)
!client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 )
yassl? ( net-libs/gnutls:0= )
!yassl? (
!libressl? ( >=dev-libs/openssl-1.0.0:0= )
libressl? ( dev-libs/libressl:0= )
)
)
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=
!bindist? (
sys-libs/binutils-libs:0=

22
dev-db/mariadb/mariadb-10.3.6_rc.ebuild
View File

@@ -81,23 +81,23 @@ COMMON_DEPEND="
jemalloc? ( dev-libs/jemalloc:0= )
tcmalloc? ( dev-util/google-perftools:0= )
systemtap? ( >=dev-util/systemtap-1.3:0= )
!yassl? (
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= )
)
)
client-libs? (
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] )
!yassl? (
!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
)
)
!client-libs? (
>=sys-libs/zlib-1.2.3:0=
kerberos? ( virtual/krb5 )
yassl? ( net-libs/gnutls:0= )
!yassl? (
!libressl? ( >=dev-libs/openssl-1.0.0:0= )
libressl? ( dev-libs/libressl:0= )
)
)
sys-libs/ncurses:0=
!bindist? (
@@ -114,7 +114,7 @@ COMMON_DEPEND="
innodb-lz4? ( app-arch/lz4 )
innodb-lzo? ( dev-libs/lzo )
innodb-snappy? ( app-arch/snappy )
mroonga? ( app-text/groonga-normalizer-mysql )
mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
numa? ( sys-process/numactl )
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( virtual/pam:0= )