Bug#816328: light-locker: FTBFS[!linux]: unconditionally configures --with-systemd
Package: light-locker
Version: 1.7.0-2
Severity: wishlist
Tags: patch
Hi,
light-locker unconditionally configures --with-systemd, although that
only makes sense on linux. Without that, it builds fine on kfreebsd and
probably hurd.
With that change, the libsystemd-dev build-dependency (which is listed
twice BTW) is not needed any more on those platforms.
Please find a debdiff attached for both these things. Thank you!
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 10.1-0-amd64
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru light-locker-1.7.0/debian/control light-locker-1.7.0/debian/control
--- light-locker-1.7.0/debian/control 2015-11-18 12:44:49.000000000 +0000
+++ light-locker-1.7.0/debian/control 2016-02-29 22:09:16.000000000 +0000
@@ -7,8 +7,8 @@
Simon Huggins <huggie@earth.li>
Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf,
liblightdm-gobject-dev (>= 1.3.5), libgtk-3-dev, libdbus-glib-1-dev,
- libxss-dev, libsystemd-dev, intltool, xfce4-dev-tools, libtool,
- libsystemd-dev
+ libxss-dev, intltool, xfce4-dev-tools, libtool,
+ libsystemd-dev [linux-any]
Standards-Version: 3.9.6
Homepage: https://github.com/the-cavalry/light-locker/
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/light-locker
diff -Nru light-locker-1.7.0/debian/rules light-locker-1.7.0/debian/rules
--- light-locker-1.7.0/debian/rules 2015-07-09 16:11:26.000000000 +0100
+++ light-locker-1.7.0/debian/rules 2016-02-29 22:13:04.000000000 +0000
@@ -3,10 +3,16 @@
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ ARCH_OPTS := --with-systemd
+endif
+
override_dh_auto_configure:
NOCONFIGURE=1 xdt-autogen
dh_auto_configure -- --disable-silent-rules \
- --with-systemd \
+ $(ARCH_OPTS) \
--with-upower \
--with-console-kit \
--with-mit-ext
Reply to: