Hi! On Wed, 2014-10-01 at 22:20:31 +0100, Steven Chamberlain wrote: > In addition to fixing the syntax error in include/dlcon.h, the attached > packaging changes seem to allow apt-cacher-ng to still build on > non-Linux, and the sysvinit scripts still work to start and stop it.
> diff -Nru apt-cacher-ng-0.8.0~rc3.orig/debian/rules > apt-cacher-ng-0.8.0~rc3/debian/rules > --- apt-cacher-ng-0.8.0~rc3.orig/debian/rules 2014-09-20 11:53:25.000000000 > +0100 > +++ apt-cacher-ng-0.8.0~rc3/debian/rules 2014-10-01 22:05:13.062740285 > +0100 > @@ -13,6 +13,8 @@ > export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) > export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) > > +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) > + > %: > dh $@ --parallel --with systemd > > @@ -22,8 +24,10 @@ > override_dh_install: > dh_install $(shell test -e build/acngfs || echo -Xacngfs) > sed -e s,^Type=simple,Type=notify, < systemd/apt-cacher-ng.service > > debian/apt-cacher-ng.service > -# make sure it has sd_notify support enabled > +ifeq ($(DEB_BUILD_ARCH_OS),linux) I think you want DEB_HOST_ARCH_OS here too. > + # on Linux, make sure it has sd_notify support enabled > grep -q libsystemd $(TGT)/usr/sbin/apt-cacher-ng > +endif > cp systemd/apt-cacher-ng.conf debian/apt-cacher-ng.tmpfile > install -m 755 scripts/expire-caller.pl $(TGT)/usr/lib/apt-cacher-ng > $(MAKE) -C dbgen package DBGENERATOR=dbgenerator Thanks, Guillem -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
