security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-09 21:28:51 +01:00
Code Activity

speedo: Fixes for native build.

Browse Source 
* build-aux/speedo.mk (TARGETOS): Init with empty string.
(speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
(INST_VERSION, INST_PROD_VERSION): Create only for w32.
This commit is contained in:
Werner Koch 2014-10-27 18:02:46 +01:00
parent a59a866459
commit 158fe90018
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build-aux/speedo.mk
View File

@ -108,7 +108,7 @@ this-w32-source: check-tools
WHAT=git WHAT=git
# Set target to "native" or "w32" # Set target to "native" or "w32"
TARGETOS=w32 TARGETOS=
# Set to 1 to build the GUI tools # Set to 1 to build the GUI tools
WITH_GUI=0 WITH_GUI=0
@ -382,16 +382,23 @@ speedo_pkg_libgcrypt_configure = --disable-static
speedo_pkg_libksba_configure = --disable-static speedo_pkg_libksba_configure = --disable-static
ifeq ($(TARGETOS),w32)
speedo_pkg_gnupg_configure = --enable-gpg2-is-gpg --disable-g13 speedo_pkg_gnupg_configure = --enable-gpg2-is-gpg --disable-g13
else
speedo_pkg_gnupg_configure = --disable-g13
endif
speedo_pkg_gnupg_extracflags = -g speedo_pkg_gnupg_extracflags = -g
# Create the version info files only for W32 so that they won't get
# installed if for example INSTALL_PREFIX=/usr/local is used.
ifeq ($(TARGETOS),w32)
define speedo_pkg_gnupg_post_install define speedo_pkg_gnupg_post_install
(set -e; \ (set -e; \
sed -n 's/.*PACKAGE_VERSION "\(.*\)"/\1/p' config.h >$(idir)/INST_VERSION; \ sed -n 's/.*PACKAGE_VERSION "\(.*\)"/\1/p' config.h >$(idir)/INST_VERSION; \
sed -n 's/.*W32INFO_VI_PRODUCTVERSION \(.*\)/\1/p' common/w32info-rc.h \ sed -n 's/.*W32INFO_VI_PRODUCTVERSION \(.*\)/\1/p' common/w32info-rc.h \
|sed 's/,/./g' >$(idir)/INST_PROD_VERSION ) |sed 's/,/./g' >$(idir)/INST_PROD_VERSION )
endef endef
endif
# The LDFLAGS is needed for -lintl for glib. # The LDFLAGS is needed for -lintl for glib.
speedo_pkg_gpgme_configure = \ speedo_pkg_gpgme_configure = \
@ -566,13 +573,19 @@ endif
BUILD_ISODATE=$(shell date -u +%Y-%m-%d) BUILD_ISODATE=$(shell date -u +%Y-%m-%d)
# The next two macros will work only after gnupg has been build. # The next two macros will work only after gnupg has been build.
ifeq ($(TARGETOS),w32)
INST_VERSION=$(shell head -1 $(idir)/INST_VERSION) INST_VERSION=$(shell head -1 $(idir)/INST_VERSION)
INST_PROD_VERSION=$(shell head -1 $(idir)/INST_PROD_VERSION) INST_PROD_VERSION=$(shell head -1 $(idir)/INST_PROD_VERSION)
endif
# List with packages # List with packages
speedo_build_list = $(speedo_spkgs) speedo_build_list = $(speedo_spkgs)
speedo_w64_build_list = $(speedo_w64_spkgs) speedo_w64_build_list = $(speedo_w64_spkgs)
# To avoid running external commands during the read phase (":=" style
# assignments), we check that the targetos has been given
ifneq ($(TARGETOS),)
# Determine build and host system # Determine build and host system
build := $(shell $(topsrc)/autogen.sh --silent --print-build) build := $(shell $(topsrc)/autogen.sh --silent --print-build)
ifeq ($(TARGETOS),w32) ifeq ($(TARGETOS),w32)
@ -596,6 +609,9 @@ else
speedo_makeopt=-j$(MAKE_J) speedo_makeopt=-j$(MAKE_J)
endif endif
# End non-empty TARGETOS
endif
# The playground area is our scratch area, where we unpack, build and # The playground area is our scratch area, where we unpack, build and
@ -975,6 +991,8 @@ clean-speedo:
# #
# Windows installer # Windows installer
# #
# {{{
ifeq ($(TARGETOS),w32)
dist-source: all dist-source: all
for i in 00 01 02 03; do sleep 1;touch PLAY/stamps/stamp-*-${i}-*;done for i in 00 01 02 03; do sleep 1;touch PLAY/stamps/stamp-*-${i}-*;done
@ -1028,6 +1046,10 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
$(w32src)/inst.nsi $(w32src)/inst.nsi
@echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)" @echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)"
endif
# }}} W32
# #
# Check availibility of standard tools # Check availibility of standard tools
# #