From 154ecf17bddc85c1cea0786e5c5792aca45413ca Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 24 Jan 2024 13:41:04 +0100 Subject: 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. --- build-aux/speedo.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'build-aux') diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 00244fa8e..477873f60 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -304,14 +304,9 @@ w32src := $(topsrc)/build-aux/speedo/w32 # Fixme: Do we need to build pkg-config for cross-building? speedo_spkgs = \ - libgpg-error npth libgcrypt - -ifeq ($(TARGETOS),w32) -speedo_spkgs += \ - zlib bzip2 sqlite -endif - -speedo_spkgs += libassuan libksba ntbtls gnupg + libgpg-error npth libgcrypt \ + zlib bzip2 sqlite \ + libassuan libksba ntbtls gnupg ifeq ($(STATIC),0) speedo_spkgs += gpgme @@ -546,7 +541,7 @@ speedo_pkg_gnupg_configure = \ else speedo_pkg_gnupg_configure = --disable-g13 --enable-wks-tools endif -speedo_pkg_gnupg_extracflags = -g +speedo_pkg_gnupg_extracflags = # Create the version info files only for W32 so that they won't get # installed if for example INSTALL_PREFIX=/usr/local is used. -- cgit v1.2.3