diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2020-03-08 21:41:18 +0100 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2020-03-08 21:41:18 +0100 |
| commit | 5de7489e70ddd82f9857a6f7db661ce17b4da959 (patch) | |
| tree | 21ecb09d71b0cd582d462d47a5e3868bd4fa7a23 | |
| parent | c8a18baa42dc08ad7f9324999e7eae3ba59c46e5 (diff) | |
automatically order apt without a builddep override
apt no longer needs its builddep override, because its g++ dependency
was dropped again.
At the same time, it gained a dependency on triehash, so the present
builddep override was wrong.
Once removing it, we can order it automatically.
| -rwxr-xr-x | bootstrap.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index ca988f5..2df95f2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -620,13 +620,7 @@ add_automatic() { automatic_packages=$(set_add "$automatic_packages" "$1"); } add_automatic acl add_automatic adns - -builddep_apt() { - # g++ dependency needs toolchain translation - assert_built "bzip2 curl db-defaults db5.3 gnutls28 lz4 xz-utils zlib libzstd" - apt_get_install cmake debhelper dh-systemd docbook-xml docbook-xsl dpkg-dev gettext "libbz2-dev:$1" "libcurl4-gnutls-dev:$1" "libdb-dev:$1" "libgnutls28-dev:$1" "liblz4-dev:$1" "liblzma-dev:$1" pkg-config po4a xsltproc "zlib1g-dev:$1" "libzstd-dev:$1" -} - +add_automatic apt add_automatic attr add_automatic autogen add_automatic base-files @@ -2472,6 +2466,7 @@ for pkg in $(discover_essential); do fi done add_need acl # by coreutils, systemd +add_need apt # almost essential add_need attr # by coreutils, libcap-ng add_need autogen # by gcc-VER, gnutls28 add_need blt # by pythonX.Y @@ -2504,7 +2499,6 @@ add_need libtasn1-6 # by gnutls28 add_need libtextwrap # by cdebconf add_need libunistring # by gnutls28 add_need libxrender # by cairo -add_need libzstd # by apt add_need lz4 # by systemd add_need make-dfsg # for build-essential add_need man-db # for debhelper @@ -2808,12 +2802,6 @@ mark_built brotli automatically_cross_build_packages -cross_build apt -mark_built apt -# almost essential - -automatically_cross_build_packages - cross_build gdbm pkg.gdbm.nodietlibc gdbm_1 mark_built gdbm # needed by man-db, perl, python2.7 |