Source: minissdpd
Version: 1.2.20130907-3.1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
minissdpd fails to cross build from source, because it invokes the build
architecture compiler. Passing a triplet-prefixed CC to make fixes that.
It also uses freebsd libraries when building on kfreebsd-any rather than
when building for kfreebsd-any. The attached patch fixes both issues and
makes a cross build succeed. Please consider applying it.
Helmut
diff --minimal -Nru minissdpd-1.2.20130907/debian/changelog
minissdpd-1.2.20130907/debian/changelog
--- minissdpd-1.2.20130907/debian/changelog 2016-07-13 20:12:39.000000000
+0200
+++ minissdpd-1.2.20130907/debian/changelog 2016-09-29 06:47:24.000000000
+0200
@@ -1,3 +1,12 @@
+minissdpd (1.2.20130907-3.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS (Closes: #-1)
+ + Pass triplet-prefixed CC to make
+ + Fix build/host confusion
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 29 Sep 2016 06:46:56 +0200
+
minissdpd (1.2.20130907-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru minissdpd-1.2.20130907/debian/patches/cross.patch
minissdpd-1.2.20130907/debian/patches/cross.patch
--- minissdpd-1.2.20130907/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ minissdpd-1.2.20130907/debian/patches/cross.patch 2016-09-29
06:46:35.000000000 +0200
@@ -0,0 +1,16 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: fix build/host confusion in Makefile
+
+Index: minissdpd-1.2.20130907/Makefile
+===================================================================
+--- minissdpd-1.2.20130907.orig/Makefile
++++ minissdpd-1.2.20130907/Makefile
+@@ -53,7 +53,7 @@
+ endif
+
+ minissdpd: $(MINISSDPDOBJS)
+- if [ $(DEB_BUILD_ARCH_OS) = "kfreebsd" ] ; then \
++ if [ $(DEB_HOST_ARCH_OS) = "kfreebsd" ] ; then \
+ $(CC) $(CFLAGS) $(LDFLAGS) -lfreebsd-glue -o $@
$(MINISSDPDOBJS) ; \
+ else \
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MINISSDPDOBJS) ; \
diff --minimal -Nru minissdpd-1.2.20130907/debian/patches/series
minissdpd-1.2.20130907/debian/patches/series
--- minissdpd-1.2.20130907/debian/patches/series 2014-07-14
09:02:57.000000000 +0200
+++ minissdpd-1.2.20130907/debian/patches/series 2016-09-29
06:40:37.000000000 +0200
@@ -1,2 +1,3 @@
link-with-lfreebsd-glue.patch
using-LDFLAGS-in-Makefile.patch
+cross.patch
diff --minimal -Nru minissdpd-1.2.20130907/debian/rules
minissdpd-1.2.20130907/debian/rules
--- minissdpd-1.2.20130907/debian/rules 2016-07-13 20:07:34.000000000 +0200
+++ minissdpd-1.2.20130907/debian/rules 2016-09-29 06:40:28.000000000 +0200
@@ -3,9 +3,12 @@
export DEB_BUILD_HARDENING=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/buildflags.mk
-
-export DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture | grep DEB_BUILD_ARCH_OS
| cut -d= -f2)
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+export DEB_HOST_ARCH_OS
configure: configure-stamp
configure-stamp:
@@ -17,7 +20,7 @@
build-indep: build-stamp
build-stamp:
dh_testdir
- $(MAKE)
+ $(MAKE) CC=$(CC)
touch $@
clean:
