From 26ee947dfdba00d9657b1fa83f3d714932087111 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Sun, 14 Jul 2024 06:46:23 +0200 Subject: [PATCH] speedo,w32: configure --libdir for w32 builds * build-aux/speedo.mk (SETVARS): Set --libdir when cross compiling. -- This ensures that the libdir is reliably named "lib" instead of lib64 for 64 bit builds on systems which have this as the default. This fixes among other things that PKG_CONFIG_PATH is then set correctly. --- build-aux/speedo.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 683bab955..d99f37937 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -765,6 +765,9 @@ define SETVARS fi; \ pkgbdir="$(bdir)/$(1)"; \ pkgcfg="$(call GETVAR,speedo_pkg_$(1)_configure)"; \ + if [ "$(TARGETOS)" != native ]; then \ + pkgcfg="$(pkgcfg) --libdir=$(idir)/lib"; \ + fi; \ tmp="$(speedo_w32_cflags) \ $(call GETVAR,speedo_pkg_$(1)_extracflags)"; \ if [ x$$$$(echo "$$$$tmp" | tr -d '[:space:]')x != xx ]; then \