From 11b4552d8a9a19816748558f98cf44b7b189428d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 22 Jul 2021 20:19:29 +0200 Subject: [PATCH] package/mariadb: provide native compiled mariadb_config - 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 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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)) -- 2.30.2