From 36e8ee557c8ce6c95700d525ff579a5c0dccb210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 18 Aug 2020 19:53:55 +0700 Subject: [PATCH 1/2] xbps-src: use internal config in foreign environment When xbps-install is called without "-C", xbps-install will pick configuration from the location configured at build time. Should the default location not have a valid repository configuration, we couldn't run binary-bootstrap. Run xbps-install with our internal configuration instead. --- xbps-src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbps-src b/xbps-src index 2462ddc0b89..9923d8a9597 100755 --- a/xbps-src +++ b/xbps-src @@ -613,7 +613,7 @@ if [ "$IN_CHROOT" ]; then readonly XBPS_BUILDDIR=/builddir else readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR" - readonly XBPS_INSTALL_CMD="xbps-install -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR" + readonly XBPS_INSTALL_CMD="xbps-install -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR -C etc/xbps.d" readonly XBPS_QUERY_CMD="xbps-query -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR" readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR" readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR" From 09aa4535b0f5820b6b8ae5d4e5f83267322c5fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 18 Aug 2020 20:42:51 +0700 Subject: [PATCH 2/2] xbps-src: environment: keep LD_LIBRARY_PATH outside of chroot Using self-built xbps in non-standard location requires setting LD_LIBRARY_PATH. Thus, bootstrapping from foreign distribution with those binaries failed. --- common/environment/setup/sourcepkg.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index bc06f745b78..d7253459be3 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -16,9 +16,13 @@ unset -v go_import_path go_package go_mod_mode unset -v patch_args disable_parallel_build keep_libtool_archives make_use_env unset -v reverts subpackages makedepends hostmakedepends checkdepends depends restricted unset -v nopie build_options build_options_default bootstrap repository reverts -unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH +unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF PKG_CONFIG +if [ "$IN_CHROOT" ]; then + unset -v LD_LIBRARY_PATH +fi + # hooks/do-extract/00-distfiles unset -v skip_extraction