Source: qiv
Version: 2.3.2-1
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Now that #879108 is fixed, upstream introduced a new of breaking cross
builds: stripping with the build architecture strip via install -s.
Beyond breaking cross compilation, this also breaks
DEB_BUILD_OPTIONS=nostrip as well as generation of -dbgsym packages.
dh_auto_install therefore passes an INSTALL that ignores the -s flag,
but qiv doesn't have a substitutable install. The attached patch fixes
all of the above. Please consider applying it as well.
Helmut
--- qiv-2.3.2.orig/Makefile
+++ qiv-2.3.2/Makefile
@@ -55,6 +55,7 @@
endif
PKG_CONFIG ?= pkg-config
+INSTALL ?= install
#CFLAGS = -O0 -g -Wall
CFLAGS = -O2 -Wall \
-fcaller-saves -ffast-math -fno-strength-reduce \
@@ -145,26 +146,26 @@
install: $(PROGRAM)
@echo "Installing QIV..."
@if [ ! -e $(PREFIX)/bin ]; then \
- install -d -m 0755 $(PREFIX)/bin; \
+ $(INSTALL) -d -m 0755 $(PREFIX)/bin; \
echo install -d -m 0755 $(PREFIX)/bin; \
fi
- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
+ $(INSTALL) -s -m 0755 $(PROGRAM) $(PREFIX)/bin
@if [ ! -e $(PREFIX)/share/man/man1 ]; then \
echo install -d -m 0755 $(PREFIX)/share/man/man1; \
- install -d -m 0755 $(PREFIX)/share/man/man1; \
+ $(INSTALL) -d -m 0755 $(PREFIX)/share/man/man1; \
fi
- install -m 0644 $(PROGRAM).1 $(PREFIX)/share/man/man1
+ $(INSTALL) -m 0644 $(PROGRAM).1 $(PREFIX)/share/man/man1
$(COMPRESS_PROG) $(PREFIX)/share/man/man1/$(PROGRAM).1
@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
- install -d -m 0755 $(PREFIX)/share/pixmaps; \
+ $(INSTALL) -d -m 0755 $(PREFIX)/share/pixmaps; \
fi
- install -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
+ $(INSTALL) -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
@if [ ! -e $(PREFIX)/share/applications ]; then \
echo install -d -m 0755 $(PREFIX)/share/applications; \
- install -d -m 0755 $(PREFIX)/share/applications; \
+ $(INSTALL) -d -m 0755 $(PREFIX)/share/applications; \
fi
- install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
+ $(INSTALL) -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
@if ./qiv -f ./intro.jpg ; \
then echo "-- Test Passed --" ; \
else echo "-- Test Failed --" ; \
