Source: dbskkd-cdb
Version: 1:3.00-3
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
dbskkd-cdb fails to cross build from source, because it uses the build
architecture compiler. It is debian/rules that hard codes gcc. The usual
solution of letting dh_auto_build pass cross tools does not work here as
debian/rules stuffs CFLAGS into the CC variable. One usually separates
them out to CFLAGS. Please consider applying the attached patch to
implement that and make dbskkd-cdb cross buildable. Alternatively,
please pass $(CC) as CC after including /usr/share/dpkg/buildtools.mk.
That also works.
Helmut
diff --minimal -Nru dbskkd-cdb-3.00/debian/changelog
dbskkd-cdb-3.00/debian/changelog
--- dbskkd-cdb-3.00/debian/changelog 2021-01-02 09:37:03.000000000 +0100
+++ dbskkd-cdb-3.00/debian/changelog 2021-01-08 17:21:38.000000000 +0100
@@ -1,3 +1,12 @@
+dbskkd-cdb (1:3.00-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Don't stuff CFLAGS into CC.
+ + Let dh_auto_build pass cross tools to make.
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 08 Jan 2021 17:21:38 +0100
+
dbskkd-cdb (1:3.00-3) unstable; urgency=medium
[ Jelmer Vernooij ]
diff --minimal -Nru dbskkd-cdb-3.00/debian/patches/cross.patch
dbskkd-cdb-3.00/debian/patches/cross.patch
--- dbskkd-cdb-3.00/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ dbskkd-cdb-3.00/debian/patches/cross.patch 2021-01-08 17:20:58.000000000
+0100
@@ -0,0 +1,32 @@
+--- dbskkd-cdb-3.00.orig/Makefile
++++ dbskkd-cdb-3.00/Makefile
+@@ -1,12 +1,13 @@
+ # dbskkd-cdb Makefile
+
+-CC = cc -Wall -O2 -g -I/usr/local/include
++CC = cc
++CFLAGS = -Wall -O2 -g -I/usr/local/include
+ COMPAT =
+ CDBLIB = /usr/local/lib/libcdb.a
+ INSTALLDIR = /usr/local/libexec
+
+ .c.o:
+- $(CC) $(COMPAT) $(PRIVATE) -c $*.c
++ $(CC) $(CFLAGS) $(COMPAT) $(PRIVATE) -c $*.c
+
+ all: dbskkd-cdb
+
+@@ -14,11 +15,11 @@
+ /bin/rm -f dbskkd-cdb *.o
+
+ dbskkd-cdb: dbskkd-cdb.o
+- $(CC) $(COMPAT) $(PRIVATE) -o dbskkd-cdb \
++ $(CC) $(CFLAGS) $(COMPAT) $(PRIVATE) -o dbskkd-cdb \
+ dbskkd-cdb.o ${CDBLIB}
+
+ dbskkd-cdb.o: dbskkd-cdb.c
+- $(CC) $(COMPAT) $(PRIVATE) -c dbskkd-cdb.c
++ $(CC) $(CFLAGS) $(COMPAT) $(PRIVATE) -c dbskkd-cdb.c
+
+ error.o: error.c error.h
+
diff --minimal -Nru dbskkd-cdb-3.00/debian/patches/series
dbskkd-cdb-3.00/debian/patches/series
--- dbskkd-cdb-3.00/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ dbskkd-cdb-3.00/debian/patches/series 2021-01-08 17:20:27.000000000
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru dbskkd-cdb-3.00/debian/rules dbskkd-cdb-3.00/debian/rules
--- dbskkd-cdb-3.00/debian/rules 2018-11-26 17:02:05.000000000 +0100
+++ dbskkd-cdb-3.00/debian/rules 2021-01-08 17:21:36.000000000 +0100
@@ -15,7 +15,7 @@
build-arch: build-arch-stamp
build-arch-stamp:
dh_testdir
- $(MAKE) CC='gcc $(CFLAGS) $(CPPFLAGS)' \
+ dh_auto_build -- CFLAGS='$(CFLAGS) $(CPPFLAGS)' \
COMPAT='-DJISYO_FILE=\"/usr/share/skk/SKK-JISYO.cdb\"' \
CDBLIB='$(LDFLAGS) -lcdb'
touch $@
