From a5e248c730a167f43076e17d521820089a895f74 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 28 Jul 2016 08:02:37 +0200 Subject: [PATCH] xbps-src: require automake, libtool and pkg-config in the host for bootstrap. This fixes bootstrapping of libarchive. Close #4516. --- srcpkgs/libarchive/template | 5 ++++- xbps-src | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index c8e27d4f960..9b19a8258eb 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -8,7 +8,6 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) $(vopt_with expat) $(vopt_with lzo lzo2) $(vopt_with lz4) $(vopt_with ssl openssl) --without-xml2 --without-nettle --disable-rpath ac_cv_func_lchmod=no" -hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel bzip2-devel liblzma-devel $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if lzo lzo-devel) $(vopt_if lz4 lz4-devel) $(vopt_if ssl libressl-devel)" @@ -24,6 +23,10 @@ build_options="acl expat lzo lz4 ssl" # Enable acl and ssl by default. build_options_default="acl ssl" +if [ "$CHROOT_READY" ]; then + hostmakedepends="automake libtool pkg-config" +fi + pre_configure() { autoreconf -if } diff --git a/xbps-src b/xbps-src index 1d47c94ee79..5dc4927a90f 100755 --- a/xbps-src +++ b/xbps-src @@ -446,7 +446,7 @@ umask 022 # # Required utilities in host system for the bootstrap target. readonly REQHOST_UTILS_BOOTSTRAP="make gawk bash bison sed gcc g++ msgfmt makeinfo \ - perl tar xz gzip bzip2 patch flex" + perl tar xz gzip bzip2 patch flex automake libtool pkg-config" # Required utilities in host system for chroot ops. readonly REQHOST_UTILS="xbps-install xbps-query xbps-rindex xbps-uhelper \