diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-04-17 20:09:37 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-04-25 13:46:17 -0700 |
| commit | 75e623710fc4d8e428f853d4184a3b541bd5a460 (patch) | |
| tree | d08c5d1c8dbd6c2970dabc0b636f75d70a140275 /utils | |
| parent | 3ddefd7feb2014e8a45cfbb1491f4afc1a1d2d04 (diff) | |
dbus: fix new cmake build
CMake was using the wrong paths. Fix them up.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/dbus/Makefile | 5 | ||||
| -rw-r--r-- | utils/dbus/patches/010-cmake-paths.patch | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 94bfa2e94..5fc4da22c 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -72,6 +72,9 @@ $(call Package/dbus/Default/description) endef CMAKE_OPTIONS += \ + -DDBUS_SYSTEM_SOCKET=/var/run/dbus/system_bus_socket \ + -DDBUS_SESSION_SOCKET_DIR=/tmp \ + -DDBUS_SYSTEM_PID_FILE=/var/run/dbus.pid \ -DDBUS_BUILD_TESTS=OFF \ -DDBUS_LINUX=ON \ -DDBUS_DISABLE_ASSERT=ON \ @@ -84,6 +87,8 @@ CMAKE_OPTIONS += \ -DDBUS_ENABLE_VERBOSE_MODE=OFF \ -DDBUS_DISABLE_CHECKS=ON \ -DDBUS_BUILD_X11=OFF \ + -DDBUS_ENABLE_DOXYGEN_DOCS=OFF \ + -DENABLE_QT_HELP=OFF define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/utils/dbus/patches/010-cmake-paths.patch b/utils/dbus/patches/010-cmake-paths.patch new file mode 100644 index 000000000..36431eb0a --- /dev/null +++ b/utils/dbus/patches/010-cmake-paths.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -510,11 +510,11 @@ if(WIN32) + else(WIN32) + set(DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address") + set(DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients") +- set(sysconfdir "") ++ set(sysconfdir "/usr/share") + set(configdir ${sysconfdir}/dbus-1 ) + set(DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf) + set(DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf) +- set(DBUS_USER "messagebus") ++ set(DBUS_USER "root") + set(DBUS_TEST_USER "nobody") + # For best security, assume that all non-Windows platforms can do + # credentials-passing. |