From 1af459bd52c4e1e9682e8c6d6c1cfdb7549de3d6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 6 May 2018 14:06:18 +0200 Subject: [PATCH] mariadb: install staging libs to lib/mysql as well Historically programs added /usr/lib/mysql to the library search path when linking. mariadb does not do so anymore, although even its mysql_config script suggests to use this path. When an old version of the library still resides in this directory (like from an old mysql installation) it will be linked against instead of the current library which is in /usr/lib. To prevent this simply install symlinks from the staging libs in /usr/lib into /usr/lib/mysql. This fixes build failures on the build bots which are seen with libzdb and libdbi-drivers. Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 4990140111..4bfc6ac884 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=10.1.32 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source @@ -417,11 +417,12 @@ define Host/Install endef define Build/InstallDev - $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib/pkgconfig $(1)/usr/share/aclocal + $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib/mysql $(1)/usr/lib/pkgconfig $(1)/usr/share/aclocal $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/ $(LN) $(STAGING_DIR)/usr/bin/mysql_config $(2)/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmysqlclient*.so* $(1)/usr/lib/ + $(LN) --relative $(1)/usr/lib/libmysqlclient*.so* $(1)/usr/lib/mysql/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/mariadb.pc $(1)/usr/lib/pkgconfig $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/mysql.m4 $(1)/usr/share/aclocal endef -- 2.30.2