diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-04-23 22:20:55 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-26 20:13:31 +0200 |
| commit | 94cc46bc162b40725cd58a54c8b6738a16b75786 (patch) | |
| tree | 96d4eb3c62eb32eb2934afd73000e16e22c8ea56 /meta-oe | |
| parent | 50cf14b46281c02613b1792381f1863e7e29ded7 (diff) | |
| download | meta-openembedded-contrib-94cc46bc162b40725cd58a54c8b6738a16b75786.tar.gz | |
mariadb: Upgrade to 5.5.55
Fix build with gcc7
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 5 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/gcc7.patch | 13 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.5.55.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.52.bb) | 0 |
4 files changed, 16 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb index 4ce960d7da..4ce960d7da 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 4019072516..fd9dcbd1ab 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -17,9 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ + file://gcc7.patch \ " -SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" -SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" +SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd" +SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86" S = "${WORKDIR}/mariadb-${PV}" diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch new file mode 100644 index 0000000000..3e75b26c76 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch @@ -0,0 +1,13 @@ +Index: mariadb-5.5.55/client/mysql.cc +=================================================================== +--- mariadb-5.5.55.orig/client/mysql.cc ++++ mariadb-5.5.55/client/mysql.cc +@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q + mysql_free_result(fields); + break; + } +- field_names[i][num_fields*2]= '\0'; ++ field_names[i][num_fields*2][0]= '\0'; + j=0; + while ((sql_field=mysql_fetch_field(fields))) + { diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb index d7895732a6..d7895732a6 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.52.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb |