Source: makexvpics
Version: 1.0.1-3
Tags: patch
User: [email protected]
Usertags: rebootstrap
makexvpics fails to cross build from source, because it does not pass
cross tools to make. The easiest way of fixing that - using
dh_auto_build - is insufficient for making makexvpics cross buildable,
as it also passes -s to install. Doing so not only breaks cross
compilation, but also DEB_BUILD_OPTIONS=nostrip as well as generation of
-dbgsym packages. The attached patch fixes all of that. Please consider
applying it.
Helmut
diff -u makexvpics-1.0.1/Makefile makexvpics-1.0.1/Makefile
--- makexvpics-1.0.1/Makefile
+++ makexvpics-1.0.1/Makefile
@@ -10,6 +10,7 @@
PREFIX = $(DESTDIR)/usr
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1
+INSTALL ?= install
# You shouldn't need to modify anything below this line.
@@ -20,9 +21,9 @@
$(CC) $(CFLAGS) -o ppmtoxvmini ppmtoxvmini.o
install: all
- install -m 511 -s ppmtoxvmini $(BINDIR)
- install -m 555 makexvpics.sh $(BINDIR)/makexvpics
- install -m 444 makexvpics.1 ppmtoxvmini.1 $(MANDIR)
+ $(INSTALL) -m 511 -s ppmtoxvmini $(BINDIR)
+ $(INSTALL) -m 555 makexvpics.sh $(BINDIR)/makexvpics
+ $(INSTALL) -m 444 makexvpics.1 ppmtoxvmini.1 $(MANDIR)
clean:
$(RM) *.o *~ ppmtoxvmini
diff -u makexvpics-1.0.1/debian/changelog makexvpics-1.0.1/debian/changelog
--- makexvpics-1.0.1/debian/changelog
+++ makexvpics-1.0.1/debian/changelog
@@ -1,3 +1,12 @@
+makexvpics (1.0.1-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + Don't strip during make install.
+
+ -- Helmut Grohne <[email protected]> Wed, 22 May 2019 19:35:32 +0200
+
makexvpics (1.0.1-3) unstable; urgency=medium
* Update to latest policy, debhelper 9. (Closes: #817573)
diff -u makexvpics-1.0.1/debian/rules makexvpics-1.0.1/debian/rules
--- makexvpics-1.0.1/debian/rules
+++ makexvpics-1.0.1/debian/rules
@@ -19,8 +19,7 @@
build-stamp:
dh_testdir
- # Add here commands to compile the package.
- $(MAKE)
+ dh_auto_build
#/usr/bin/docbook-to-man debian/makexvpics.sgml > makexvpics.1
touch build-stamp
@@ -42,7 +41,7 @@
dh_installdirs
# Add here commands to install the package into debian/makexvpics.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/makexvpics
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/makexvpics INSTALL='install
--strip-program=true'
# Build architecture-independent files here.
