aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2020-03-04 06:37:36 +0100
committerHelmut Grohne <helmut@subdivi.de>2020-03-04 06:37:36 +0100
commit97004225c2e6f56d860e090589cf6bda22df64b3 (patch)
tree44dc15fac3f9a2d3d3cab012177363b36972c013
parent1e25c1310516315548c67e339c3b2b810faf2414 (diff)
don't build dbus anymore
We were building it for glib2.0 when it didn't support the <!noinsttest> profile. Now it does and we no longer need dbus.
-rwxr-xr-xbootstrap.sh19
1 files changed, 2 insertions, 17 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index dc89947..989aa3a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -790,13 +790,6 @@ builddep_cyrus_sasl2() {
add_automatic dash
add_automatic datefudge
add_automatic db-defaults
-
-builddep_dbus() {
- # fix FTCBS with pkg.dbus.minimal #945201
- apt_get_install pkg-config
- apt_get_build_dep "-a$1" --arch-only -P "$2" ./
-}
-
add_automatic debianutils
add_automatic diffutils
@@ -2526,7 +2519,6 @@ fi
add_need libtasn1-6 # by gnutls28
add_need libtextwrap # by cdebconf
add_need libunistring # by gnutls28
-add_need libx11 # by dbus
add_need libxrender # by cairo
add_need libzstd # by apt
add_need lz4 # by systemd
@@ -2795,21 +2787,14 @@ automatically_cross_build_packages
assert_built attr
cross_build libcap-ng nopython libcap-ng_1
mark_built libcap-ng
-# needed by audit, dbus
+# needed by audit
automatically_cross_build_packages
assert_built "gnutls28 libgcrypt20 libtool"
cross_build libprelude "nolua noperl nopython noruby" libprelude_1
mark_built libprelude
-# needed by audit, dbus
-
-automatically_cross_build_packages
-
-assert_built expat
-cross_build dbus pkg.dbus.minimal dbus_1
-mark_built dbus
-# needed by glib2.0 until it gains noinsttest
+# needed by audit
automatically_cross_build_packages