Source: signify-openbsd Version: 26-1 Tags: patch User: debian-cr...@lists.debian.org Usertags: ftcbfs
signify-openbsd fails tocross build from source, because the upstream Makefile hard codes the build architecture pkg-config. After making it substitutable, it still fails make clean, because (unlike dh_auto_build), dh_auto_clean does not pass a PKG_CONFIG. Exporting a suitable pkg-config will do here. Please consider applying the attached patch. Helmut
diff --minimal -Nru signify-openbsd-26/debian/changelog signify-openbsd-26/debian/changelog --- signify-openbsd-26/debian/changelog 2019-07-28 09:56:59.000000000 +0200 +++ signify-openbsd-26/debian/changelog 2019-07-30 13:12:52.000000000 +0200 @@ -1,3 +1,10 @@ +signify-openbsd (26-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Use a host architecture pkg-config. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Tue, 30 Jul 2019 13:12:52 +0200 + signify-openbsd (26-1) unstable; urgency=medium * New upstream version 26 diff --minimal -Nru signify-openbsd-26/debian/patches/cross.patch signify-openbsd-26/debian/patches/cross.patch --- signify-openbsd-26/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ signify-openbsd-26/debian/patches/cross.patch 2019-07-30 13:12:50.000000000 +0200 @@ -0,0 +1,38 @@ +--- signify-openbsd-26.orig/Makefile ++++ signify-openbsd-26/Makefile +@@ -5,6 +5,7 @@ + MUSL ?= 0 + BUNDLED_LIBBSD ?= 0 + PLEDGE ?= noop ++PKG_CONFIG ?= pkg-config + WGET ?= wget + libbsd_VERSION ?= 0.9.1 + libbsd_BASEURL ?= http://libbsd.freedesktop.org/releases/ +@@ -141,13 +142,13 @@ + else + + LIBBSD_PKG_VERSION := 0.7 +-LIBBSD_PKG_CHECK := $(shell pkg-config libbsd --atleast-version=$(LIBBSD_PKG_VERSION) && echo ok) ++LIBBSD_PKG_CHECK := $(shell $(PKG_CONFIG) libbsd --atleast-version=$(LIBBSD_PKG_VERSION) && echo ok) + ifneq ($(strip $(LIBBSD_PKG_CHECK)),ok) + $(error libbsd is not installed or version is older than $(LIBBSD_PKG_VERSION)) + endif + LIBBSD_DEPS := +-LIBBSD_CFLAGS := $(shell pkg-config libbsd --cflags) +-LIBBSD_LDFLAGS := $(shell pkg-config libbsd --libs) ++LIBBSD_CFLAGS := $(shell $(PKG_CONFIG) libbsd --cflags) ++LIBBSD_LDFLAGS := $(shell $(PKG_CONFIG) libbsd --libs) + + endif + +@@ -156,8 +157,8 @@ + # Git submodule corresponding to libwaive is properly checked out. + # + ifeq ($(PLEDGE),waive) +-SECCOMP_CFLAGS := $(shell pkg-config libseccomp --cflags) +-SECCOMP_LIBS := $(shell pkg-config libseccomp --libs) ++SECCOMP_CFLAGS := $(shell $(PKG_CONFIG) libseccomp --cflags) ++SECCOMP_LIBS := $(shell $(PKG_CONFIG) libseccomp --libs) + CFLAGS += $(SECCOMP_CFLAGS) -pthread + LDFLAGS += $(SECCOMP_LIBS) -pthread + S += libwaive/waive.c diff --minimal -Nru signify-openbsd-26/debian/patches/series signify-openbsd-26/debian/patches/series --- signify-openbsd-26/debian/patches/series 2019-07-28 09:56:59.000000000 +0200 +++ signify-openbsd-26/debian/patches/series 2019-07-30 13:12:10.000000000 +0200 @@ -1 +1,2 @@ 0001-replace-signify-with-signify-openbsd-in-the-manpage.patch +cross.patch diff --minimal -Nru signify-openbsd-26/debian/rules signify-openbsd-26/debian/rules --- signify-openbsd-26/debian/rules 2018-01-02 14:50:54.000000000 +0100 +++ signify-openbsd-26/debian/rules 2019-07-30 13:11:44.000000000 +0200 @@ -1,6 +1,8 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk +-include /usr/share/dpkg/buildtools.mk +export PKG_CONFIG ?= pkg-config export DEB_BUILD_MAINT_OPTIONS = hardening=+all
