mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

mariadb: fix QA Issue ELF binary has relocations in .text while multilib enabled

Browse Source 
bitbake lib32-mariadb
...
WARNING: QA Issue: ELF binary 'bitbake_build/tmp/work/x86-wrsmllib32-linux/lib32-mariadb/5.1.67-r0/packages-split/lib32-libmysqlclient/usr/lib/plugin/ha_xtradb.so.0.0.0' has relocations in .text
WARNING: QA Issue: ELF binary 'bitbake_build/tmp/work/x86-wrsmllib32-linux/lib32-mariadb/5.1.67-r0/packages-split/lib32-libmysqlclient/usr/lib/plugin/ha_innodb_plugin.so.0.0.0' has relocations in .text
...
The mariadb used absolute addresses on IA-32, we should forbid this.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Hongxu Jia
2013-11-15 16:33:06 +08:00
committed by Martin Jansa
parent a64bd5b7e4
commit baa94eb951
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
+44
View File
@@ -0,0 +1,44 @@
storage: forbids absolute addresses on IA-32
The shared lib has relocations in .text
...
WARNING: QA Issue: ELF binary '/usr/lib/plugin/ha_xtradb.so.0.0.0' has relocations in .text
WARNING: QA Issue: ELF binary '/usr/lib/plugin/ha_innodb_plugin.so.0.0.0' has relocations in .text
...
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
storage/innodb_plugin/plug.in | 2 +-
storage/xtradb/plug.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in
--- a/storage/innodb_plugin/plug.in
+++ b/storage/innodb_plugin/plug.in
@@ -50,7 +50,7 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
;;
*86)
# Use absolute addresses on IA-32
- INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
+ # INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
;;
esac
AC_SUBST(INNODB_DYNAMIC_CFLAGS)
diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in
index a33f4dc..4c186fd 100644
--- a/storage/xtradb/plug.in
+++ b/storage/xtradb/plug.in
@@ -51,7 +51,7 @@ MYSQL_PLUGIN_ACTIONS(xtradb, [
;;
*86)
# Use absolute addresses on IA-32
- INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
+ # INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
;;
esac
AC_SUBST(INNODB_DYNAMIC_CFLAGS)
--
1.7.9.5
meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
+1
View File
@@ -16,6 +16,7 @@ SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x8
file://fix-cve-2013-1861-1.patch \
file://fix-cve-2013-1861-2.patch \
file://zlib-let-libdir-configurable.patch \
file://storage-forbids-absolute-addresses-on-IA-32.patch \
file://my.cnf \
file://mysqld.sh"