1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-19 14:41:41 +02:00

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.
This commit is contained in:
Andre Heinecke 2024-07-14 06:46:23 +02:00
parent 0311239d7b
commit 26ee947dfd
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C

View File

@ -765,6 +765,9 @@ define SETVARS
fi; \ fi; \
pkgbdir="$(bdir)/$(1)"; \ pkgbdir="$(bdir)/$(1)"; \
pkgcfg="$(call GETVAR,speedo_pkg_$(1)_configure)"; \ pkgcfg="$(call GETVAR,speedo_pkg_$(1)_configure)"; \
if [ "$(TARGETOS)" != native ]; then \
pkgcfg="$(pkgcfg) --libdir=$(idir)/lib"; \
fi; \
tmp="$(speedo_w32_cflags) \ tmp="$(speedo_w32_cflags) \
$(call GETVAR,speedo_pkg_$(1)_extracflags)"; \ $(call GETVAR,speedo_pkg_$(1)_extracflags)"; \
if [ x$$$$(echo "$$$$tmp" | tr -d '[:space:]')x != xx ]; then \ if [ x$$$$(echo "$$$$tmp" | tr -d '[:space:]')x != xx ]; then \