diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-04 08:24:40 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-04 08:24:40 +0200 |
| commit | eef839fe482c8c3ba2152b3e1edd43fb21c2de02 (patch) | |
| tree | 32eff6d4ec6c2df19c393f8fc684473c1c28619d /external | |
| parent | e68a4a40ee3d321307029388107537ecee288e18 (diff) | |
fdo#82847 mariadb patch out problematic 'inline' that result in link issue
Change-Id: I60d9ba1315090c896d6f7f9b3d407ab11a1d2037
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmariadb/UnpackedTarball_mariadb.mk | 1 | ||||
| -rw-r--r-- | external/libmariadb/mariadb-inline.patch.1 | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/external/libmariadb/UnpackedTarball_mariadb.mk b/external/libmariadb/UnpackedTarball_mariadb.mk index c3c5ed4f4d94..d3a315f4b819 100644 --- a/external/libmariadb/UnpackedTarball_mariadb.mk +++ b/external/libmariadb/UnpackedTarball_mariadb.mk @@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1)) $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\ external/libmariadb/mariadb-swap.patch \ external/libmariadb/mariadb-msvc.patch.1 \ + external/libmariadb/mariadb-inline.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libmariadb/mariadb-inline.patch.1 b/external/libmariadb/mariadb-inline.patch.1 new file mode 100644 index 000000000000..84ebc814069e --- /dev/null +++ b/external/libmariadb/mariadb-inline.patch.1 @@ -0,0 +1,23 @@ +diff -ur mariadb.org/libmariadb/hash.c mariadb/libmariadb/hash.c +--- mariadb.org/libmariadb/hash.c 2014-09-03 14:57:29.000000000 +0200 ++++ mariadb/libmariadb/hash.c 2014-09-03 14:59:09.000000000 +0200 +@@ -94,7 +94,7 @@ + handle inline functions that are not defined as native types + */ + +-inline char* ++uchar* + hash_key(HASH *hash,const uchar *record,uint *length,my_bool first) + { + if (hash->get_key) +@@ -191,9 +191,6 @@ + #endif + + +-#ifndef __SUNPRO_C /* SUNPRO can't handle this */ +-inline +-#endif + unsigned int rec_hashnr(HASH *hash,const uchar *record) + { + uint length; + |