From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail5.wrs.com (mail5.windriver.com [192.103.53.11]) by mail.openembedded.org (Postfix) with ESMTP id 8B7D87CF4A for ; Fri, 8 Mar 2019 02:44:26 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id x282hpwb003538 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 7 Mar 2019 18:44:01 -0800 Received: from [128.224.162.194] (128.224.162.194) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 7 Mar 2019 18:43:40 -0800 To: Khem Raj References: <20190306091258.59600-1-mingli.yu@windriver.com> From: "Yu, Mingli" Message-ID: <5C81D868.2090903@windriver.com> Date: Fri, 8 Mar 2019 10:50:16 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [128.224.162.194] Cc: openembeded-devel Subject: Re: [meta-oe][PATCH] mysql-python: fix compilation with MariaDB 10.3.13 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2019 02:44:27 -0000 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit On 2019年03月07日 23:29, Khem Raj wrote: > Applying patch 0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch > patching file _mysql.c > Hunk #1 FAILED at 2002 (different line endings). > 1 out of 1 hunk FAILED -- saving rejects to file _mysql.c.rej Hi Khem, It's strange that I can't reproduce the Hunk issue as you mentioned while I pull the commit[5173929d7 mysql-python: fix compilation with MariaDB 10.3.13] from master-next. Does this issue still exist in your env? Thanks, > > On Wed, Mar 6, 2019 at 1:12 AM wrote: >> >> From: Mingli Yu >> >> Use standard API function MYSQL_OPT_RECONNECT >> instead of direct modification of internal structures >> which does not work for MariaDB to fix below compile >> issue. >> | _mysql.c: In function '_mysql_ConnectionObject_ping': >> | _mysql.c:2005:41: error: 'MYSQL' {aka 'struct st_mysql'} has no member named 'reconnect' >> >> Signed-off-by: Mingli Yu >> --- >> ...ompilation-with-MariaDB-with-10.3.13.patch | 39 +++++++++++++++++++ >> .../recipes-dbs/mysql/mysql-python_1.2.5.bb | 4 +- >> 2 files changed, 42 insertions(+), 1 deletion(-) >> create mode 100644 meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch >> >> diff --git a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch >> new file mode 100644 >> index 000000000..b816618c7 >> --- /dev/null >> +++ b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch >> @@ -0,0 +1,39 @@ >> +From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001 >> +From: Mingli Yu >> +Date: Wed, 6 Mar 2019 00:16:17 -0800 >> +Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13 >> + >> +Use standard API function MYSQL_OPT_RECONNECT >> +instead of direct modification of internal structures >> +which does not work for MariaDB. >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Mingli Yu >> +--- >> + _mysql.c | 9 ++++++++- >> + 1 file changed, 8 insertions(+), 1 deletion(-) >> + >> +diff --git a/_mysql.c b/_mysql.c >> +index f081346..2262e9e 100644 >> +--- a/_mysql.c >> ++++ b/_mysql.c >> +@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping( >> + int r, reconnect = -1; >> + if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL; >> + check_connection(self); >> +- if ( reconnect != -1 ) self->connection.reconnect = reconnect; >> ++ if ( reconnect != -1 ) { >> ++ #if MYSQL_VERSION_ID >= 50013 >> ++ my_bool recon = reconnect; >> ++ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon); >> ++ #else >> ++ self->connection.reconnect = reconnect; >> ++ #endif >> ++ } >> + Py_BEGIN_ALLOW_THREADS >> + r = mysql_ping(&(self->connection)); >> + Py_END_ALLOW_THREADS >> +-- >> +2.17.1 >> + >> diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb >> index ac0df4f06..f2faec1c1 100644 >> --- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb >> +++ b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb >> @@ -8,7 +8,9 @@ DEPENDS = "mysql5" >> >> SRCNAME = "MySQL-python" >> >> -SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip" >> +SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \ >> + file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \ >> +" >> SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c" >> SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74" >> >> -- >> 2.17.1 >> >