Browse Source

dbus: with disabled assertion dbus starts on x86, dbus needs c++

Waldemar Brodkorb 1 month ago
parent
commit
a4f2d3bc81
2 changed files with 3 additions and 28 deletions
  1. 3 2
      package/dbus/Makefile
  2. 0 26
      package/dbus/patches/patch-configure_ac

+ 3 - 2
package/dbus/Makefile

@@ -11,7 +11,7 @@ PKG_DESCR:=		desktop bus daemon
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		libdbus libexpat
 PKG_BUILDDEP:=		expat util-linux
-PKG_NEEDS:=		threads
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		https://dbus.freedesktop.org/releases/dbus/
 PKG_LIBNAME:=		libdbus
@@ -37,7 +37,8 @@ CMAKE_FLAGS+=		-DCMAKE_INSTALL_RUNSTATEDIR="/var/run" \
 			-DDBUS_ENABLE_QTHELP_DOCS=OFF \
 			-DDBUS_ENABLE_XML_DOCS=OFF \
 			-DENABLE_SYSTEMD=OFF \
-			-DDBUS_WITH_GLIB=OFF
+			-DDBUS_WITH_GLIB=OFF \
+			-DDBUS_DISABLE_ASSERT=ON
 
 
 libdbus-install:

+ 0 - 26
package/dbus/patches/patch-configure_ac

@@ -1,26 +0,0 @@
---- dbus-1.10.8.orig/configure.ac	2016-03-07 17:06:22.000000000 +0100
-+++ dbus-1.10.8/configure.ac	2016-11-21 11:25:39.000000000 +0100
-@@ -1186,23 +1186,9 @@ dnl systemd detection
- if test x$enable_systemd = xno ; then
-     have_systemd=no;
- else
--    PKG_CHECK_MODULES([SYSTEMD],
--        [libsystemd >= 209],
--        [have_systemd=yes],
--        [PKG_CHECK_MODULES([SYSTEMD],
--            [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32],
--            [have_systemd=yes],
--            [have_systemd=no])])
--fi
--
--if test x$have_systemd = xyes; then
-     AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd])
- fi
- 
--if test x$enable_systemd = xyes -a x$have_systemd != xyes ; then
--    AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found])
--fi
--
- # If not found in $PATH, we might still have systemd and systemctl at runtime
- # (perhaps dbus is being compiled in a minimal chroot with no systemd).
- # Assume the upstream-recommended location. Distributors with split /usr