From 3ca28d7195519d88aa3df38b7c9b99e050480ab1 Mon Sep 17 00:00:00 2001 From: Roman Shaposhnik <rvs@zededa.com> Date: Fri, 21 May 2021 14:16:02 -0700 Subject: [PATCH] Re-arranging the order in which cross packages are built in bootstrap.sh The list of packages doesn't change, but we need them build in a different order because of changing dependencies. Signed-off-by: Roman Shaposhnik <rvs@zededa.com> --- scripts/bootstrap.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 88f6429de80c..acc45f5cdbd8 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -96,9 +96,10 @@ EXTRADEPENDS_TARGET="libgcc libstdc++ musl-dev" # ordered cross-build for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \ - openssl ca-certificates libmd libbsd libretls busybox busybox-initscripts binutils make \ + openssl ca-certificates libmd \ + gmp mpfr4 mpc1 isl22 cloog libucontext binutils gcc \ + libbsd libtls-standalone busybox busybox-initscripts make \ apk-tools file \ - gmp mpfr4 mpc1 isl22 cloog libucontext gcc \ openrc alpine-conf alpine-baselayout alpine-keys alpine-base patch build-base \ attr libcap acl fakeroot tar \ lzip abuild ncurses libedit openssh \ @@ -107,7 +108,7 @@ for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \ community/go libffi community/ghc \ brotli libev c-ares cunit nghttp2 curl \ pcre libssh2 community/http-parser community/libgit2 \ - libxml2 llvm10 community/rust \ + libxml2 pax-utils llvm11 community/rust \ $KERNEL_PKG ; do EXTRADEPENDS_TARGET="$EXTRADEPENDS_TARGET" \ -- GitLab