diff mbox series

[meta-oe] mariadb: Upgrade to 10.11.7

Message ID 20240222070315.346679-1-mingli.yu@windriver.com
State Accepted
Headers show
Series [meta-oe] mariadb: Upgrade to 10.11.7 | expand

Commit Message

Yu, Mingli Feb. 22, 2024, 7:03 a.m. UTC 
From: Mingli Yu <mingli.yu@windriver.com>

As the change [1] introduced in 10.11.7, there comes below configure failure:
 | -- Performing Test HAVE_SYSTEM_LIBFMT
 | CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately:
 |    HAVE_SYSTEM_LIBFMT_EXITCODE (advanced)
 | For details see /build/tmp-glibc/work/core2-64-wrs-linux/mariadb/10.11.7/build/TryRunResults.cmake
 | -- Performing Test HAVE_SYSTEM_LIBFMT - Failed
 [snip]

Considering [1] is mainly used to test fmt 10.0.0 failure and we use libfmt
10.2.1 now, so define "-DHAVE_SYSTEM_LIBFMT_EXITCODE=0" as workaround [2] to
fix the above configure error.

[1] https://github.com/MariaDB/server/commit/b5c367cd88e37091ab5f8dab0396c01c97d037e2
[2] https://jira.mariadb.org/browse/MDEV-30694

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../{mariadb-native_10.11.6.bb => mariadb-native_10.11.7.bb}   | 0
 meta-oe/recipes-dbs/mysql/mariadb.inc                          | 3 ++-
 .../mysql/{mariadb_10.11.6.bb => mariadb_10.11.7.bb}           | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.6.bb => mariadb-native_10.11.7.bb} (100%)
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.6.bb => mariadb_10.11.7.bb} (100%)

Comments

Khem Raj Feb. 22, 2024, 3:18 p.m. UTC | #1 
fails build on arm
https://errors.yoctoproject.org/Errors/Details/754269/

On Wed, Feb 21, 2024 at 11:03 PM Yu, Mingli <mingli.yu@eng.windriver.com> wrote:
>
> From: Mingli Yu <mingli.yu@windriver.com>
>
> As the change [1] introduced in 10.11.7, there comes below configure failure:
>  | -- Performing Test HAVE_SYSTEM_LIBFMT
>  | CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately:
>  |    HAVE_SYSTEM_LIBFMT_EXITCODE (advanced)
>  | For details see /build/tmp-glibc/work/core2-64-wrs-linux/mariadb/10.11.7/build/TryRunResults.cmake
>  | -- Performing Test HAVE_SYSTEM_LIBFMT - Failed
>  [snip]
>
> Considering [1] is mainly used to test fmt 10.0.0 failure and we use libfmt
> 10.2.1 now, so define "-DHAVE_SYSTEM_LIBFMT_EXITCODE=0" as workaround [2] to
> fix the above configure error.
>
> [1] https://github.com/MariaDB/server/commit/b5c367cd88e37091ab5f8dab0396c01c97d037e2
> [2] https://jira.mariadb.org/browse/MDEV-30694
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>  .../{mariadb-native_10.11.6.bb => mariadb-native_10.11.7.bb}   | 0
>  meta-oe/recipes-dbs/mysql/mariadb.inc                          | 3 ++-
>  .../mysql/{mariadb_10.11.6.bb => mariadb_10.11.7.bb}           | 0
>  3 files changed, 2 insertions(+), 1 deletion(-)
>  rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.6.bb => mariadb-native_10.11.7.bb} (100%)
>  rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.6.bb => mariadb_10.11.7.bb} (100%)
>
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
> index 25dc15b46..9be8ef3eb 100644
> --- a/meta-oe/recipes-dbs/mysql/mariadb.inc
> +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
> @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
>             file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
>            "
>  SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
> -SRC_URI[sha256sum] = "1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67"
> +SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
>
>  UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
>
> @@ -96,6 +96,7 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \
>                   -DMYSQL_DATADIR:PATH=/var/mysql \
>                   -DCAT_EXECUTABLE=`which cat` \
>                   -DSTACK_DIRECTION=1 \
> +                 -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \
>                   -DCMAKE_AR:FILEPATH=${AR}"
>
>
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108982): https://lists.openembedded.org/g/openembedded-devel/message/108982
> Mute This Topic: https://lists.openembedded.org/mt/104504689/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Yu, Mingli Feb. 26, 2024, 8:23 a.m. UTC | #2 
On 2/22/24 23:18, Khem Raj wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
> 
> fails build on arm
> https://errors.yoctoproject.org/Errors/Details/754269/

V2 is incoming.

Thanks,

> 
> On Wed, Feb 21, 2024 at 11:03 PM Yu, Mingli <mingli.yu@eng.windriver.com> wrote:
>>
>> From: Mingli Yu <mingli.yu@windriver.com>
>>
>> As the change [1] introduced in 10.11.7, there comes below configure failure:
>>   | -- Performing Test HAVE_SYSTEM_LIBFMT
>>   | CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately:
>>   |    HAVE_SYSTEM_LIBFMT_EXITCODE (advanced)
>>   | For details see /build/tmp-glibc/work/core2-64-wrs-linux/mariadb/10.11.7/build/TryRunResults.cmake
>>   | -- Performing Test HAVE_SYSTEM_LIBFMT - Failed
>>   [snip]
>>
>> Considering [1] is mainly used to test fmt 10.0.0 failure and we use libfmt
>> 10.2.1 now, so define "-DHAVE_SYSTEM_LIBFMT_EXITCODE=0" as workaround [2] to
>> fix the above configure error.
>>
>> [1] https://github.com/MariaDB/server/commit/b5c367cd88e37091ab5f8dab0396c01c97d037e2
>> [2] https://jira.mariadb.org/browse/MDEV-30694
>>
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> ---
>>   .../{mariadb-native_10.11.6.bb => mariadb-native_10.11.7.bb}   | 0
>>   meta-oe/recipes-dbs/mysql/mariadb.inc                          | 3 ++-
>>   .../mysql/{mariadb_10.11.6.bb => mariadb_10.11.7.bb}           | 0
>>   3 files changed, 2 insertions(+), 1 deletion(-)
>>   rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.6.bb => mariadb-native_10.11.7.bb} (100%)
>>   rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.6.bb => mariadb_10.11.7.bb} (100%)
>>
>> diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
>> similarity index 100%
>> rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb
>> rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
>> diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
>> index 25dc15b46..9be8ef3eb 100644
>> --- a/meta-oe/recipes-dbs/mysql/mariadb.inc
>> +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
>> @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
>>              file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
>>             "
>>   SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
>> -SRC_URI[sha256sum] = "1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67"
>> +SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
>>
>>   UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
>>
>> @@ -96,6 +96,7 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \
>>                    -DMYSQL_DATADIR:PATH=/var/mysql \
>>                    -DCAT_EXECUTABLE=`which cat` \
>>                    -DSTACK_DIRECTION=1 \
>> +                 -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \
>>                    -DCMAKE_AR:FILEPATH=${AR}"
>>
>>
>> diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
>> similarity index 100%
>> rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb
>> rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
>> --
>> 2.25.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#108982): https://lists.openembedded.org/g/openembedded-devel/message/108982
>> Mute This Topic: https://lists.openembedded.org/mt/104504689/1997914
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 25dc15b46..9be8ef3eb 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -25,7 +25,7 @@  SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
           "
 SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
-SRC_URI[sha256sum] = "1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67"
+SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
@@ -96,6 +96,7 @@  EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \
                  -DMYSQL_DATADIR:PATH=/var/mysql \
                  -DCAT_EXECUTABLE=`which cat` \
                  -DSTACK_DIRECTION=1 \
+                 -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \
                  -DCMAKE_AR:FILEPATH=${AR}"
 
 
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb