Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 668344 - media/kodi-17.6-r6 broken mysql support with USE="mariadb"
Summary: media/kodi-17.6-r6 broken mysql support with USE="mariadb"
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Craig Andrews
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-10-11 18:48 UTC by Tiziano Müller (RETIRED)
Modified: 2018-10-12 17:43 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Tiziano Müller (RETIRED) gentoo-dev 2018-10-11 18:48:49 UTC
While it seems logical to allow either USE="mysql" or USE="mariadb", neither the actual dependency on {mysql,mariadb}-connector-c nor the CMake flag to enable MySQL-Support with USE="mariadb" were updated for -r6, resulting in no MySQL-Support with USE="mariadb".

I applied something like the following:

diff --git a/media-tv/kodi/kodi-17.6-r6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild
index 6b505c1116f..43db5acde40 100644
--- a/media-tv/kodi/kodi-17.6-r6.ebuild
+++ b/media-tv/kodi/kodi-17.6-r6.ebuild
@@ -77,10 +77,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
                >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
                <media-video/ffmpeg-3.4
        )
-       mysql? (
-               !mariadb? ( dev-db/mysql-connector-c:= )
-               mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-       )
+       mysql? ( dev-db/mysql-connector-c:= )
+       mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
        >=net-misc/curl-7.51.0
        nfs? ( net-fs/libnfs:= )
        opengl? ( media-libs/glu )
@@ -223,7 +221,6 @@ src_configure() {
                -DENABLE_LCMS2=$(usex lcms)
                -DENABLE_LIRC=$(usex lirc)
                -DENABLE_MICROHTTPD=$(usex webserver)
-               -DENABLE_MYSQLCLIENT=$(usex mysql)
                -DENABLE_NFS=$(usex nfs)
                -DENABLE_NONFREE=$(usex nonfree)
                -DENABLE_OPENGLES=$(usex gles)
@@ -247,6 +244,12 @@ src_configure() {
 
        use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 
+       if use mysql || use mariadb ; then
+               mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
+       else
+               mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
+       fi
+
        if use system-ffmpeg; then
                mycmakeargs+=( -DWITH_FFMPEG="yes" )
        else
Comment 1 Larry the Git Cow gentoo-dev 2018-10-12 17:42:53 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d6d29779e56296bb74c4e7b3a730499a071006

commit a7d6d29779e56296bb74c4e7b3a730499a071006
Author:     Craig Andrews <candrews@gentoo.org>
AuthorDate: 2018-10-12 17:22:13 +0000
Commit:     Craig Andrews <candrews@gentoo.org>
CommitDate: 2018-10-12 17:42:45 +0000

    media-tv/kodi: Fix mariadb support
    
    Closes: https://bugs.gentoo.org/668344
    Signed-off-by: Craig Andrews <candrews@gentoo.org>
    Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-tv/kodi/kodi-17.6-r7.ebuild | 298 ++++++++++++++++++++++++++++++++++++++
 media-tv/kodi/kodi-9999.ebuild    |   6 +-
 2 files changed, 300 insertions(+), 4 deletions(-)
Comment 2 Craig Andrews gentoo-dev 2018-10-12 17:43:41 UTC
Thanks for this great bug report - and sorry for the trouble.