Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[packaging] Adjust libsystemd build requirements
The systemd development packages have changed and there are build time
warnings like:

  sd_notify was moved to libsystemd. Do not use libsystemd-daemon.

Use libsystemd as instructed.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Apr 26, 2017
1 parent f1a17e3 commit 06a379d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion configure.ac
Expand Up @@ -75,7 +75,7 @@ AM_CONDITIONAL([CONNMAN], [test x$connman = xtrue])

AC_ARG_ENABLE([systemd], AS_HELP_STRING([--enable-systemd], [Enable systemd notify interface @<:@default=false@:>@]),
[case "${enableval}" in
yes) systemd=true ; CFLAGS="-DSYSTEMD -lsystemd-daemon $CFLAGS" ;;
yes) systemd=true ; CFLAGS="-DSYSTEMD $CFLAGS" ;;
no) systemd=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-systemd]) ;;
esac],[systemd=false])
Expand All @@ -98,6 +98,7 @@ PKG_CHECK_MODULES([USB_MODED], [
libudev
libkmod
ssu-sysinfo
libsystemd
])

AC_SUBST(USB_MODED_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion rpm/usb-moded.spec
Expand Up @@ -14,7 +14,7 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(libkmod)
BuildRequires: doxygen
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(ssu-sysinfo)

Requires: lsof
Expand Down

0 comments on commit 06a379d

Please sign in to comment.