Source: care
Version: 2.2.1-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
care fails to cross build from source, because the upstream build system
hard codes the build architecture objdump and objcopy. Please consider
applying the attached patch to make them substitutable and substituted.
Helmut
diff --minimal -Nru care-2.2.1/debian/changelog care-2.2.1/debian/changelog
--- care-2.2.1/debian/changelog 2015-03-01 01:15:00.000000000 +0100
+++ care-2.2.1/debian/changelog 2020-02-21 19:07:12.000000000 +0100
@@ -1,3 +1,12 @@
+care (2.2.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Make objdump and objcopy substitutable.
+ + Substitute objdump and objcopy.
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 21 Feb 2020 19:07:12 +0100
+
care (2.2.1-1) unstable; urgency=low
* Initial release (Closes: #779349)
diff --minimal -Nru care-2.2.1/debian/patches/cross.patch
care-2.2.1/debian/patches/cross.patch
--- care-2.2.1/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ care-2.2.1/debian/patches/cross.patch 2020-02-21 19:07:11.000000000
+0100
@@ -0,0 +1,26 @@
+--- care-2.2.1.orig/src/GNUmakefile
++++ care-2.2.1/src/GNUmakefile
+@@ -8,6 +8,8 @@
+ INSTALL = install
+ CC = gcc
+ LD = $(CC)
++OBJCOPY = objcopy
++OBJDUMP = objdump
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
+ CFLAGS += -Wall -Wextra -O2
+ LDFLAGS += -ltalloc
+@@ -119,11 +121,11 @@
+ LINK = $($(quiet)LD) -o $@ $^ $(LDFLAGS)
+
+ OBJIFY = $($(quiet)GEN)
\
+- objcopy
\
++ $(OBJCOPY)
\
+ --input binary
\
+- --output `env LANG=C objdump -f cli/cli.o |
\
++ --output `env LANG=C $(OBJDUMP) -f cli/cli.o |
\
+ perl -pe '/file format (.*)$$/; $$_ = $$1'`
\
+- --binary-architecture `env LANG=C objdump -f cli/cli.o |
\
++ --binary-architecture `env LANG=C $(OBJDUMP) -f cli/cli.o |
\
+ perl -pe '/architecture: (\w+).*/; $$_ =
$$1'` \
+ $< $@
+
diff --minimal -Nru care-2.2.1/debian/patches/series
care-2.2.1/debian/patches/series
--- care-2.2.1/debian/patches/series 2015-03-01 01:11:16.000000000 +0100
+++ care-2.2.1/debian/patches/series 2020-02-21 19:06:00.000000000 +0100
@@ -1 +1,2 @@
Add-care-manual.patch
+cross.patch
diff --minimal -Nru care-2.2.1/debian/rules care-2.2.1/debian/rules
--- care-2.2.1/debian/rules 2015-03-01 01:11:16.000000000 +0100
+++ care-2.2.1/debian/rules 2020-02-21 19:07:12.000000000 +0100
@@ -1,12 +1,15 @@
#!/usr/bin/make -f
# -*- makefile -*-
+
+include /usr/share/dpkg/buildtools.mk
+
%:
dh $@ --sourcedirectory=src
# Force make to print the commands
# By default V=0
override_dh_auto_build:
- dh_auto_build -- V=1 care
+ dh_auto_build -- V=1 OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) care
override_dh_auto_install:
make -C src install-care V=1 DESTDIR=$$(pwd)/debian/care/usr/bin
