Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17792 from TDT-AG/pr/20220104-dbus

Browse source 
dbus: switching back to autotools to fix big endian issue
This commit is contained in:
Florian Eckert 2022-02-04 15:54:47 +01:00 committed by GitHub
commit 62d9ae9e26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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