speedo: Build zlib, bzip2 and sqlite also on Unix.

--

This avoids extra build dependencies.  Note that bzip2 is not
necessary statically linked but an existing bzip2 SO might be used.
We would need to fix the bzip2 SO building and also provide a gnupg
configure option to build statically against bzip2.
This commit is contained in:
Werner Koch 2024-01-24 13:41:04 +01:00
parent bea31c845a
commit 154ecf17bd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 4 additions and 9 deletions

View File

@ -304,14 +304,9 @@ w32src := $(topsrc)/build-aux/speedo/w32
# Fixme: Do we need to build pkg-config for cross-building? # Fixme: Do we need to build pkg-config for cross-building?
speedo_spkgs = \ speedo_spkgs = \
libgpg-error npth libgcrypt libgpg-error npth libgcrypt \
zlib bzip2 sqlite \
ifeq ($(TARGETOS),w32) libassuan libksba ntbtls gnupg
speedo_spkgs += \
zlib bzip2 sqlite
endif
speedo_spkgs += libassuan libksba ntbtls gnupg
ifeq ($(STATIC),0) ifeq ($(STATIC),0)
speedo_spkgs += gpgme speedo_spkgs += gpgme
@ -546,7 +541,7 @@ speedo_pkg_gnupg_configure = \
else else
speedo_pkg_gnupg_configure = --disable-g13 --enable-wks-tools speedo_pkg_gnupg_configure = --disable-g13 --enable-wks-tools
endif endif
speedo_pkg_gnupg_extracflags = -g speedo_pkg_gnupg_extracflags =
# Create the version info files only for W32 so that they won't get # Create the version info files only for W32 so that they won't get
# installed if for example INSTALL_PREFIX=/usr/local is used. # installed if for example INSTALL_PREFIX=/usr/local is used.