Commit 7a11ac41 authored by Aaron M. Ucko's avatar Aaron M. Ucko

debian/rules: Use host-specific pkg-config per H. Grohne (#914480).

Use host-specific pkg-config in FTCONFIG for the sake of cross builds,
per Helmut Grohne.
parent 5c5ef7c0
......@@ -9,8 +9,10 @@ fltk1.1 (1.1.10-26) UNRELEASED; urgency=medium
configure saved and restored rather than deleted on cleanup.
- Use /usr/share/dpkg/{architecture,buildflags}.mk instead of calling
dpkg-{architecture,buildflags} directly (and piecemeal).
- Use host-specific pkg-config in FTCONFIG for the sake of cross
builds, per Helmut Grohne. (Closes: #914480.)
-- Aaron M. Ucko <amu@ucko.debian.net> Sun, 10 Feb 2019 22:25:38 -0500
-- Aaron M. Ucko <ucko@debian.org> Sun, 10 Feb 2019 22:31:27 -0500
fltk1.1 (1.1.10-25) unstable; urgency=medium
......
......@@ -7,6 +7,7 @@ include /usr/share/dpkg/buildflags.mk
XCFLAGS = -Wall -Wunused -Wno-format-y2k -fPIE -fno-strict-aliasing
PKG_CONFIG = /usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
GAMES = blocks checkers sudoku
EXTRA_MFLAGS = OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@:
......@@ -26,7 +27,7 @@ override_dh_autoreconf_clean:
override_dh_auto_configure:
mv fltk.spec fltk.spec.saved
dh_auto_configure -- FTCONFIG="/usr/bin/pkg-config freetype2" \
dh_auto_configure -- FTCONFIG="$(PKG_CONFIG) freetype2" \
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-threads --enable-xft \
--enable-xinerama --without-links --libdir=$(libdir) \
......
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