diff options
| author |   Koen Kooi <koen.kooi@linaro.org> | 2014-02-19 09:23:38 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-23 23:17:30 +0100 |
| commit | 0d4dac81c62fab275be360bca44e43a49350ec6e (patch) | |
| tree | 832dff302466fb4a909da7493ada0530b98e7af9 /meta-oe/recipes-support/mysql | |
| parent | 7a673eb37eb784b604f57884f802635aa2c1a49a (diff) | |
| download | meta-openembedded-0d4dac81c62fab275be360bca44e43a49350ec6e.tar.gz | |
mariadb: move linker fix to .inc
When using a recent cross-binutils you need this fix as well, so move it from -native to the .inc.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index 15605d0e2d..942afcc55d 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb @@ -9,9 +9,6 @@ PACKAGES = "" EXTRA_OEMAKE = "" EXTRA_OECONF = " --with-embedded-server " -SRC_URI += "file://fix-link-error-ub1310.patch \ -" - do_install() { oe_runmake 'DESTDIR=${D}' install mv -f ${D}${libdir}/mysql/* ${D}${libdir} diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc index e311ed70f5..100b3a7d7f 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc @@ -17,7 +17,9 @@ SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x8 file://storage-forbids-absolute-addresses-on-IA-32.patch \ file://my.cnf \ file://mysqld.sh \ - file://avoid-plugin-options-warnings.patch" + file://avoid-plugin-options-warnings.patch \ + file://fix-link-error-ub1310.patch \ + " SRC_URI[md5sum] = "44c331fa91943155e4796f89e17a0612" SRC_URI[sha256sum] = "33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8" |