Source: rlinetd
Version: 0.9.3-3
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

rlinetd fails to cross build from source, because debian/rules hard
codes the build architecture pkgconf. As a result tirpc is not found and
things go bad. I'm attaching a patch to make it use the host
architecture one for your convenience.

Helmut
diff --minimal -Nru rlinetd-0.9.3/debian/changelog 
rlinetd-0.9.3/debian/changelog
--- rlinetd-0.9.3/debian/changelog      2024-09-01 23:55:53.000000000 +0200
+++ rlinetd-0.9.3/debian/changelog      2024-10-14 18:45:50.000000000 +0200
@@ -1,3 +1,10 @@
+rlinetd (0.9.3-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host architecture pkgconf. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 14 Oct 2024 18:45:50 +0200
+
 rlinetd (0.9.3-3) unstable; urgency=low
 
   * Fix FTBFS by switching to libtirpc (closes: #1066466). Thanks to
diff --minimal -Nru rlinetd-0.9.3/debian/control rlinetd-0.9.3/debian/control
--- rlinetd-0.9.3/debian/control        2024-09-01 23:55:53.000000000 +0200
+++ rlinetd-0.9.3/debian/control        2024-10-14 18:45:50.000000000 +0200
@@ -9,7 +9,7 @@
                libcap2-dev [linux-any],
                libtirpc-dev,
                libwrap0-dev,
-               pkgconf-bin
+               pkgconf,
 Rules-Requires-Root: no
 Homepage: https://salsa.debian.org/debian/rlinetd
 Vcs-Git: https://salsa.debian.org/debian/rlinetd.git -b debian
diff --minimal -Nru rlinetd-0.9.3/debian/rules rlinetd-0.9.3/debian/rules
--- rlinetd-0.9.3/debian/rules  2024-09-01 23:55:53.000000000 +0200
+++ rlinetd-0.9.3/debian/rules  2024-10-14 18:45:50.000000000 +0200
@@ -2,26 +2,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildtools.mk
+
 BUILD_DIR       := BUILD
 DH_AUTO_OPTIONS := -v -Sautoconf --parallel -B$(BUILD_DIR)
 DESTDIR         := $(CURDIR)/debian/$(shell dh_listpackages)
 
 DEB_BUILD_MAINT_OPTIONS  := hardening=+all abi=+lfs
 # TODO: add support for libtirpc into upstream packaging instead
-DEB_CFLAGS_MAINT_APPEND  := $(shell pkgconf --cflags libtirpc)
-DEB_LDFLAGS_MAINT_APPEND := $(shell pkgconf --libs libtirpc)
+DEB_CFLAGS_MAINT_APPEND  := $(shell $(PKG_CONFIG) --cflags libtirpc)
+DEB_LDFLAGS_MAINT_APPEND := $(shell $(PKG_CONFIG) --libs libtirpc)
 DPKG_EXPORT_BUILDFLAGS   := 1
 
 include /usr/share/dpkg/buildflags.mk
-include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
 
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-  CC := $(DEB_HOST_GNU_TYPE)-gcc
-else
-  CC := gcc
-endif
-
 # check for maintainer mode
 ifneq (,$(findstring maintainer,$(DEB_BUILD_OPTIONS)))
   MAINTAINER_MODE := yes

Reply via email to