Skip to content

Commit 74840ae

Browse files
albertdalbertd
committed
[bluez5_utils] build without dbus
1 parent 744b40b commit 74840ae

File tree

3 files changed

+192
-2
lines changed

3 files changed

+192
-2
lines changed

‎package/bluez5_utils/0002-remove-dbus-dependency.patch‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
diff -Naur a/configure b/configure
2+
--- a/configure 2018-09-28 06:34:32.966936000 +0000
3+
+++ b/configure 2018-09-28 06:33:25.802936000 +0000
4+
@@ -13326,134 +13326,6 @@
5+
fi
6+
7+
8+
-pkg_failed=no
9+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
10+
-$as_echo_n "checking for DBUS... " >&6; }
11+
-
12+
-if test -n "$DBUS_CFLAGS"; then
13+
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
14+
- elif test -n "$PKG_CONFIG"; then
15+
- if test -n "$PKG_CONFIG" && \
16+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.6\""; } >&5
17+
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.6") 2>&5
18+
- ac_status=$?
19+
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20+
- test $ac_status = 0; }; then
21+
- pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.6" 2>/dev/null`
22+
- test "x$?" != "x0" && pkg_failed=yes
23+
-else
24+
- pkg_failed=yes
25+
-fi
26+
- else
27+
- pkg_failed=untried
28+
-fi
29+
-if test -n "$DBUS_LIBS"; then
30+
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
31+
- elif test -n "$PKG_CONFIG"; then
32+
- if test -n "$PKG_CONFIG" && \
33+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.6\""; } >&5
34+
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.6") 2>&5
35+
- ac_status=$?
36+
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
37+
- test $ac_status = 0; }; then
38+
- pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.6" 2>/dev/null`
39+
- test "x$?" != "x0" && pkg_failed=yes
40+
-else
41+
- pkg_failed=yes
42+
-fi
43+
- else
44+
- pkg_failed=untried
45+
-fi
46+
-
47+
-
48+
-
49+
-if test $pkg_failed = yes; then
50+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
51+
-$as_echo "no" >&6; }
52+
-
53+
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
54+
- _pkg_short_errors_supported=yes
55+
-else
56+
- _pkg_short_errors_supported=no
57+
-fi
58+
- if test $_pkg_short_errors_supported = yes; then
59+
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.6" 2>&1`
60+
- else
61+
- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.6" 2>&1`
62+
- fi
63+
- # Put the nasty error message in config.log where it belongs
64+
- echo "$DBUS_PKG_ERRORS" >&5
65+
-
66+
- as_fn_error $? "D-Bus >= 1.6 is required" "$LINENO" 5
67+
-elif test $pkg_failed = untried; then
68+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
69+
-$as_echo "no" >&6; }
70+
- as_fn_error $? "D-Bus >= 1.6 is required" "$LINENO" 5
71+
-else
72+
- DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
73+
- DBUS_LIBS=$pkg_cv_DBUS_LIBS
74+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
75+
-$as_echo "yes" >&6; }
76+
- dummy=yes
77+
-fi
78+
-
79+
-
80+
-
81+
-
82+
-# Check whether --with-dbusconfdir was given.
83+
-if test "${with_dbusconfdir+set}" = set; then :
84+
- withval=$with_dbusconfdir; path_dbusconfdir=${withval}
85+
-fi
86+
-
87+
-if (test -z "${path_dbusconfdir}"); then
88+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking D-Bus configuration directory" >&5
89+
-$as_echo_n "checking D-Bus configuration directory... " >&6; }
90+
- path_dbusconfdir="`$PKG_CONFIG --variable=sysconfdir dbus-1`"
91+
- if (test -z "${path_dbusconfdir}"); then
92+
- as_fn_error $? "D-Bus configuration directory is required" "$LINENO" 5
93+
- fi
94+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${path_dbusconfdir}" >&5
95+
-$as_echo "${path_dbusconfdir}" >&6; }
96+
-fi
97+
-DBUS_CONFDIR=${path_dbusconfdir}
98+
-
99+
-
100+
-
101+
-# Check whether --with-dbussystembusdir was given.
102+
-if test "${with_dbussystembusdir+set}" = set; then :
103+
- withval=$with_dbussystembusdir; path_dbussystembusdir=${withval}
104+
-fi
105+
-
106+
-if (test -z "${path_dbussystembusdir}"); then
107+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking D-Bus system bus services dir" >&5
108+
-$as_echo_n "checking D-Bus system bus services dir... " >&6; }
109+
- path_dbussystembusdir="`$PKG_CONFIG --variable=system_bus_services_dir dbus-1`"
110+
- if (test -z "${path_dbussystembusdir}"); then
111+
- as_fn_error $? "D-Bus system bus services directory is required" "$LINENO" 5
112+
- fi
113+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${path_dbussystembusdir}" >&5
114+
-$as_echo "${path_dbussystembusdir}" >&6; }
115+
-fi
116+
-DBUS_SYSTEMBUSDIR=${path_dbussystembusdir}
117+
-
118+
-
119+
-
120+
-# Check whether --with-dbussessionbusdir was given.
121+
-if test "${with_dbussessionbusdir+set}" = set; then :
122+
- withval=$with_dbussessionbusdir; path_dbussessionbusdir=${withval}
123+
-fi
124+
-
125+
-if (test -z "${path_dbussessionbusdir}"); then
126+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking D-Bus session bus services dir" >&5
127+
-$as_echo_n "checking D-Bus session bus services dir... " >&6; }
128+
- path_dbussessionbusdir="`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`"
129+
- if (test -z "${path_dbussessionbusdir}"); then
130+
- as_fn_error $? "D-Bus session bus services directory is required" "$LINENO" 5
131+
- fi
132+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${path_dbussessionbusdir}" >&5
133+
-$as_echo "${path_dbussessionbusdir}" >&6; }
134+
-fi
135+
-DBUS_SESSIONBUSDIR=${path_dbussessionbusdir}
136+
137+
138+
# Check whether --enable-backtrace was given.
139+
diff -Naur a/Makefile.in b/Makefile.in
140+
--- a/Makefile.in 2018-09-28 06:32:15.998936000 +0000
141+
+++ b/Makefile.in 2018-09-28 06:32:24.110936000 +0000
142+
@@ -83,11 +83,10 @@
143+
POST_UNINSTALL = :
144+
build_triplet = @build@
145+
host_triplet = @host@
146+
-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
147+
- $(am__EXEEXT_4)
148+
-noinst_PROGRAMS = $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
149+
+bin_PROGRAMS = $(am__EXEEXT_4)
150+
+#noinst_PROGRAMS = $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
151+
$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_13)
152+
-libexec_PROGRAMS = src/bluetoothd$(EXEEXT) obexd/src/obexd$(EXEEXT)
153+
+#libexec_PROGRAMS = src/bluetoothd$(EXEEXT) obexd/src/obexd$(EXEEXT)
154+
@LIBRARY_TRUE@am__append_1 = $(lib_headers)
155+
@LIBRARY_TRUE@am__append_2 = lib/libbluetooth.la
156+
DIST_COMMON = $(srcdir)/Makefile.plugins $(srcdir)/Makefile.tools \
157+
@@ -1798,7 +1797,7 @@
158+
$(systemduserunit_DATA)
159+
am__include_HEADERS_DIST = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
160+
lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h lib/rfcomm.h \
161+
- lib/bnep.h lib/cmtp.h lib/hidp.h
162+
+ lib/bnep.h lib/cmtp.h lib/hidp.h lib/mgmt.h
163+
HEADERS = $(include_HEADERS)
164+
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
165+
$(LISP)config.h.in
166+
@@ -2167,9 +2166,7 @@
167+
AM_MAKEFLAGS = --no-print-directory
168+
lib_LTLIBRARIES = $(am__append_2)
169+
noinst_LIBRARIES = $(am__append_7)
170+
-noinst_LTLIBRARIES = lib/libbluetooth-internal.la \
171+
- gdbus/libgdbus-internal.la src/libshared-glib.la \
172+
- src/libshared-mainloop.la
173+
+noinst_LTLIBRARIES = lib/libbluetooth-internal.la
174+
dist_man_MANS = $(am__append_31) $(am__append_34) $(am__append_37)
175+
dist_noinst_MANS = $(am__append_53)
176+
CLEANFILES = $(builtin_files) src/bluetooth.service \
177+
@@ -2255,12 +2252,12 @@
178+
plugindir = $(libdir)/bluetooth/plugins
179+
@MAINTAINER_MODE_FALSE@build_plugindir = $(plugindir)
180+
@MAINTAINER_MODE_TRUE@build_plugindir = $(abs_top_srcdir)/plugins/.libs
181+
-plugin_LTLIBRARIES = $(am__append_24) $(am__append_25) \
182+
+#plugin_LTLIBRARIES = $(am__append_24) $(am__append_25) \
183+
$(am__append_47)
184+
lib_sources = lib/bluetooth.c lib/hci.c lib/sdp.c
185+
lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
186+
lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \
187+
- lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h
188+
+ lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h lib/mgmt.h
189+
190+
extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h
191+
extra_sources = lib/uuid.c

‎package/bluez5_utils/Config.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ config BR2_PACKAGE_BLUEZ5_UTILS
77
depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version
88
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
99
depends on BR2_TOOLCHAIN_HAS_SYNC_4
10-
select BR2_PACKAGE_DBUS
1110
select BR2_PACKAGE_LIBGLIB2
1211
help
1312
bluez utils version 5.x

‎package/bluez5_utils/bluez5_utils.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BLUEZ5_UTILS_VERSION = 5.44
88
BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
99
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
1010
BLUEZ5_UTILS_INSTALL_STAGING = YES
11-
BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
11+
BLUEZ5_UTILS_DEPENDENCIES = libglib2
1212
BLUEZ5_UTILS_LICENSE = GPLv2+, LGPLv2.1+
1313
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
1414

0 commit comments

Comments
 (0)