mirror/openwrt-packages
1
0
Fork 0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-18 05:13:56 +02:00
Code Releases Activity

dbus: switching back to autotools to fix big endian issue

Browse Source 
According to the upstream developers of dbus, cmake is only inteded for
windows. Unix like operating systems should continue to use the
autotools stack.

Since the changeover to cmake, the dbus was no longer usable on all big
endian systems because the name binding no longer worked.

In cmake, it is not evaluated whether it should run on a little endian
or big endian system.

This fixes issue #17780. The original problem occurred when using the
modem manager on the big endian system (MIPS).

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2022-02-04 11:30:38 +01:00
parent 2b28e3dfdb
commit da442b467d
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
utils/dbus/Makefile
View File

@ -19,11 +19,13 @@ PKG_MAINTAINER:=
PKG_LICENSE:=AFL-2.1 PKG_LICENSE:=AFL-2.1
PKG_CPE_ID:=cpe:/a:freedesktop:dbus PKG_CPE_ID:=cpe:/a:freedesktop:dbus
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_DBUS_VERBOSE CONFIG_DBUS_VERBOSE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/dbus/Default define Package/dbus/Default
SECTION:=utils SECTION:=utils
@ -78,27 +80,37 @@ define Package/dbus/config
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endef endef
CMAKE_OPTIONS += \ CONFIGURE_ARGS += \
-DDBUS_SYSTEM_SOCKET=/var/run/dbus/system_bus_socket \ --disable-maintainer-mode \
-DDBUS_SESSION_SOCKET_DIR=/tmp \ --disable-developer \
-DDBUS_BUILD_TESTS=OFF \ --enable-debug=no \
-DDBUS_LINUX=ON \ --enable-shared \
-DDBUS_DISABLE_ASSERT=ON \ --disable-static \
-DBUS_ENABLE_STATS=OFF \ --disable-verbose-mode \
-DDBUS_ENABLE_CONTAINERS=OFF \ --disable-asserts \
-DENABLE_SYSTEMD=OFF \ --disable-xml-docs \
-DDBUS_BUS_ENABLE_SYSTEMD=OFF \ --disable-doxygen-docs \
-DHAVE_SYSTEMD=OFF \ --disable-ducktype-docs \
-DDBUS_WITH_GLIB=OFF \ --disable-selinux \
-DDBUS_ENABLE_VERBOSE_MODE=OFF \ --disable-apparmor \
-DDBUS_DISABLE_CHECKS=ON \ --disable-libaudit \
-DDBUS_BUILD_X11=OFF \ --enable-inotify \
-DDBUS_ENABLE_DOXYGEN_DOCS=OFF \ --disable-kqueue \
-DDBUS_ENABLE_QTHELP_DOCS=OFF \ --disable-console-owner-file \
-DDBUS_ENABLE_XML_DOCS=OFF --disable-systemd \
--disable-tests \
--disable-code-coverage \
--disable-x11-autolaunch \
--with-session-socket-dir=/tmp \
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-system-pid-file=/var/run/dbus.pid \
--with-dbus-user=root \
--without-x \
--enable-qt-help=no \
--disable-xml-docs
ifeq ($(CONFIG_DBUS_VERBOSE),y) ifeq ($(CONFIG_DBUS_VERBOSE),y)
CMAKE_OPTIONS += -DDBUS_ENABLE_VERBOSE_MODE=ON CONFIGURE_ARGS += --disable-verbose-mode
endif endif
define Build/InstallDev define Build/InstallDev
@ -130,7 +142,7 @@ define Package/dbus/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-uuidgen $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-uuidgen $(1)/usr/bin/
$(INSTALL_BIN) ./files/dbus-launch $(1)/usr/bin/ $(INSTALL_BIN) ./files/dbus-launch $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/dbus-daemon-launch-helper $(1)/usr/lib/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dbus-daemon-launch-helper $(1)/usr/lib/
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dbus.init $(1)/etc/init.d/dbus $(INSTALL_BIN) ./files/dbus.init $(1)/etc/init.d/dbus
$(INSTALL_DIR) $(1)/usr/share/dbus-1 $(INSTALL_DIR) $(1)/usr/share/dbus-1