[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#962430: ebook2cw FTCBFS: strips with the build architecture strip



Source: ebook2cw
Version: 0.8.2-2
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs

ebook2cw fails to cross build from source, because it strips with the
build architecture strip during make install via install -s. Beyond
breaking cross compilation, doing so also breaks
DEB_BUILD_OPTIONS=nostrip as well as generation of -dbgsym packages.
Please consider applying the attached patch to fix all of these.

Helmut
diff --minimal -Nru ebook2cw-0.8.2/debian/changelog ebook2cw-0.8.2/debian/changelog
--- ebook2cw-0.8.2/debian/changelog	2015-11-12 15:10:06.000000000 +0100
+++ ebook2cw-0.8.2/debian/changelog	2020-06-07 09:47:17.000000000 +0200
@@ -1,3 +1,10 @@
+ebook2cw (0.8.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Don't strip during make install. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 07 Jun 2020 09:47:17 +0200
+
 ebook2cw (0.8.2-2) unstable; urgency=low
 
   * Bump Standard-Version to 3.9.6.
diff --minimal -Nru ebook2cw-0.8.2/debian/patches/cross.patch ebook2cw-0.8.2/debian/patches/cross.patch
--- ebook2cw-0.8.2/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ ebook2cw-0.8.2/debian/patches/cross.patch	2020-06-07 09:46:45.000000000 +0200
@@ -0,0 +1,37 @@
+--- ebook2cw-0.8.2.orig/Makefile
++++ ebook2cw-0.8.2/Makefile
+@@ -10,6 +10,7 @@
+ USE_LAME?=YES
+ USE_OGG?=YES
+ 
++INSTALL?=install
+ CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(ROOT_DESTDIR)\" -D VERSION=\"$(VERSION)\"
+ 
+ ifeq ($(USE_LAME), YES)
+@@ -37,16 +38,16 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -static ebook2cw.c $(LDFLAGS) -lm -o ebook2cw
+ 
+ install:
+-	install -d -v                      $(DESTDIR)/share/man/man1/
+-	install -d -v                      $(DESTDIR)/bin/
+-	install -d -v                      $(DESTDIR)/share/doc/ebook2cw/
+-	install -d -v                      $(DESTDIR)/share/doc/ebook2cw/examples/
+-	install -s -m 0755 ebook2cw        $(DESTDIR)/bin/
+-	install    -m 0644 ebook2cw.1      $(DESTDIR)/share/man/man1/
+-	install    -m 0644 README          $(DESTDIR)/share/doc/ebook2cw/
+-	install    -m 0644 ebook2cw.conf   $(DESTDIR)/share/doc/ebook2cw/examples/
+-	install    -m 0644 isomap.txt      $(DESTDIR)/share/doc/ebook2cw/examples/
+-	install    -m 0644 utf8map.txt     $(DESTDIR)/share/doc/ebook2cw/examples/
++	$(INSTALL) -d -v                      $(DESTDIR)/share/man/man1/
++	$(INSTALL) -d -v                      $(DESTDIR)/bin/
++	$(INSTALL) -d -v                      $(DESTDIR)/share/doc/ebook2cw/
++	$(INSTALL) -d -v                      $(DESTDIR)/share/doc/ebook2cw/examples/
++	$(INSTALL) -s -m 0755 ebook2cw        $(DESTDIR)/bin/
++	$(INSTALL)    -m 0644 ebook2cw.1      $(DESTDIR)/share/man/man1/
++	$(INSTALL)    -m 0644 README          $(DESTDIR)/share/doc/ebook2cw/
++	$(INSTALL)    -m 0644 ebook2cw.conf   $(DESTDIR)/share/doc/ebook2cw/examples/
++	$(INSTALL)    -m 0644 isomap.txt      $(DESTDIR)/share/doc/ebook2cw/examples/
++	$(INSTALL)    -m 0644 utf8map.txt     $(DESTDIR)/share/doc/ebook2cw/examples/
+ 	
+ uninstall:
+ 	rm -f $(DESTDIR)/bin/ebook2cw
diff --minimal -Nru ebook2cw-0.8.2/debian/patches/series ebook2cw-0.8.2/debian/patches/series
--- ebook2cw-0.8.2/debian/patches/series	2013-01-23 11:32:31.000000000 +0100
+++ ebook2cw-0.8.2/debian/patches/series	2020-06-07 09:45:55.000000000 +0200
@@ -2,3 +2,4 @@
 escape-minuses-on-manpage.patch
 makefile-respect-CC-CFLAGS.patch
 configfile-buffer-overflow.patch
+cross.patch
diff --minimal -Nru ebook2cw-0.8.2/debian/rules ebook2cw-0.8.2/debian/rules
--- ebook2cw-0.8.2/debian/rules	2013-01-22 11:49:59.000000000 +0100
+++ ebook2cw-0.8.2/debian/rules	2020-06-07 09:47:15.000000000 +0200
@@ -11,3 +11,6 @@
 
 %:
 	dh $@
+
+override_dh_auto_install:
+	dh_auto_install -- INSTALL='install --strip-program=true'

Reply to: