Commit 8cccd254 authored by Aaron M. Ucko's avatar Aaron M. Ucko

rules: Address FTCBFS, based on a patch from Helmut Grohne (#887636)

* Avoid configuring during clean.
* Do not pass build architecture compiler to configure.
* In arch-only builds, limit coverage of test/ to the three targets we
  specifically need for fltk1.1-games.  (Many of the others involve
  trying to run freshly built fluid.)
parent d6b0137f
fltk1.1 (1.1.10-24) UNRELEASED; urgency=medium
* NOT YET RELEASED.
-- Aaron M. Ucko <ucko@debian.org> Fri, 09 Mar 2018 17:08:10 -0500
* debian/rules: Address FTCBFS, based on a patch from Helmut Grohne
(Closes: #887636).
- Avoid configuring during clean.
- Do not pass build architecture compiler to configure.
- In arch-only builds, limit coverage of test/ to the three targets we
specifically need for fltk1.1-games. (Many of the others involve
trying to run freshly built fluid.)
-- Aaron M. Ucko <ucko@debian.org> Fri, 09 Mar 2018 17:26:50 -0500
fltk1.1 (1.1.10-23) unstable; urgency=medium
......
......@@ -13,27 +13,34 @@ XCFLAGS = -Wall -Wunused -Wno-format-y2k -fPIE -fno-strict-aliasing
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
GAMES = blocks checkers sudoku
EXTRA_MFLAGS = OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@:
%:
dh $@
override_dh_auto_configure:
mv fltk.spec fltk.spec.saved
dh_auto_configure -- CC="$(CC)" CXX="$(CXX)" \
dh_auto_configure -- \
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-threads --enable-xft \
--enable-xinerama --without-links --libdir=$(libdir) \
--with-optim=$(filter -O%,$(CXXFLAGS))
mv fltk.spec.saved fltk.spec
override_dh_auto_build:
dh_auto_build -- OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@:
# documentation/Makefile ignores errors from htmldoc, so this command
# should be safe to run unconditionally.
override_dh_auto_build-arch:
dh_auto_build -- $(EXTRA_MFLAGS) DIRS='$$(IMAGEDIRS) src fluid'
$(MAKE) -C test $(EXTRA_MFLAGS) $(GAMES)
override_dh_auto_build-indep:
dh_auto_build -- $(EXTRA_MFLAGS) DIRS='test documentation'
$(MAKE) -C documentation fltk.pdf fltk.ps
override_dh_auto_clean:
mv fltk.spec fltk.spec.saved
# Avoid reconfigure. Removed by distclean. >> deliberate -- keeping
# existing contents allows for proper cleaning between builds.
echo 'RMDIR = rm -Rf' >> makeinclude
dh_auto_clean
mv fltk.spec.saved fltk.spec
......@@ -50,7 +57,7 @@ override_dh_auto_install-arch:
mkdir -p debian/tmp/usr/share/man/man6
mkdir -p debian/tmp/usr/share/pixmaps
## fltk1.1-games (installed by hand to be able to add fl prefixes.)
for game in blocks checkers sudoku; do \
for game in $(GAMES); do \
cp test/$$game debian/tmp/usr/games/fl$$game && \
sed -e 's,Exec=,&/usr/games/fl,; s,Icon=,&fl,; s,Name=,&FLTK ,' \
test/desktop/$$game.desktop \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment