[Buildroot] [git commit branch/next] package/mariadb: provide native compiled mariadb_config
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Sun Jul 25 19:38:49 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=11b4552d8a9a19816748558f98cf44b7b189428d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
- overwrite cross-compiled mariadb_config executable (used from the
mysql_config script) by a native/host compiled one
Fixes (qt5base configure):
Trying source 0 (type mysqlConfig) of library mysql ...
+ .../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mysql_config --version
> .../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mysql_config: line 100: \
.../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config: cannot execute binary file: Exec format error
with
$ file host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config
host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config: ELF 64-bit LSB pie executable, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-aarch64.so.1, for GNU/Linux 5.10.0, with debug_info, not stripped
Reported-by: Scott Bartolett <SBartolett at thorlabs.com>
Signed-off-by: Peter Seiderer <ps.report at gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/mariadb/mariadb.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index ade73ccfe0..374b3dc352 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -135,5 +135,13 @@ endef
MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL
+# overwrite cross-compiled mariadb_config executable by an native one
+define MARIADB_POST_STAGING_INSTALL
+ $(HOSTCC) -I$(@D)/libmariadb/include \
+ -o $(STAGING_DIR)/usr/bin/mariadb_config \
+ $(@D)/libmariadb/mariadb_config/mariadb_config.c
+endef
+MARIADB_POST_INSTALL_STAGING_HOOKS += MARIADB_POST_STAGING_INSTALL
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
More information about the buildroot
mailing list