Skip to content

Commit

Permalink
build: resolve debian issue with systemd-dev package
Browse files Browse the repository at this point in the history
Use conditional package dependency logic to allow for the
newer split in systemd development packages.

Fixes Debian bug #1060493
  • Loading branch information
natoscott committed May 14, 2024
1 parent c270776 commit 401419c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pcp (6.2.2-1) unstable; urgency=low

* New release (full details in CHANGELOG).
* Fix build dependency on [lib]systemd-dev (closes: #1060493)
* Relocate pmcheck to resolve a Perl conflict (closes: #1071010)

-- Nathan Scott <[email protected]> Wed, 15 May 2024 06:22:01 +1000
Expand Down
4 changes: 2 additions & 2 deletions debian/fixcontrol
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fi

# PMDA_SYSTEMD is only true if we have libsystemd, but HAVE_SYSTEMD
# may be true when we're using systemd even if libsystemd is not
# installed ... so use the former to enable the libsystemd-dev in
# installed ... so use the former to enable the [lib]systemd-dev in
# the Build-Depends: clause
# Note: that the HAVE_SYSTEMD_SD_DAEMON_H macro that is used to
# guard the use of libsystemd from libpcp is not available here, but
Expand All @@ -127,7 +127,7 @@ fi
#
if $PMDA_SYSTEMD
then
echo "s/?{libsystemd-dev}, /systemd, libsystemd-dev, /" >>$tmp.sed
echo "s/?{libsystemd-dev}, /systemd, systemd-dev | libsystemd-dev, /" >>$tmp.sed
else
echo "s/?{libsystemd-dev}, //" >>$tmp.sed
fi
Expand Down

0 comments on commit 401419c

Please sign in to comment.