diff options
| author | Andre Heinecke <aheinecke@gnupg.org> | 2024-07-14 06:46:23 +0200 |
|---|---|---|
| committer | Andre Heinecke <aheinecke@gnupg.org> | 2024-07-14 07:02:27 +0200 |
| commit | 26ee947dfdba00d9657b1fa83f3d714932087111 (patch) | |
| tree | 6c6c599af6cb41198aaed6c26fa37b8314af29a0 | |
| parent | speedo: Add VERBOSE variable (diff) | |
| download | gnupg2-26ee947dfdba00d9657b1fa83f3d714932087111.tar.xz gnupg2-26ee947dfdba00d9657b1fa83f3d714932087111.zip | |
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.
| -rw-r--r-- | build-aux/speedo.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 \ |