From 6ce531b2319de222627d09cf0509c79bd3112feb Mon Sep 17 00:00:00 2001 From: John Date: Fri, 29 May 2020 14:30:06 +0200 Subject: [PATCH] common: unser PKG_CONFIG before sourcing templates, set PKG_CONFIG also for native --- common/environment/setup/sourcepkg.sh | 2 +- common/xbps-src/shutils/common.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index 94b24ac8921..bc06f745b78 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -17,7 +17,7 @@ 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 CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF +unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF PKG_CONFIG # hooks/do-extract/00-distfiles unset -v skip_extraction diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 5ddf57a0330..e8bcf577c6b 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -606,6 +606,7 @@ setup_pkg() { export OBJCOPY="objcopy" export NM="nm" export READELF="readelf" + export PKG_CONFIG="pkg-config" export RUST_TARGET="$XBPS_RUST_TARGET" export RUST_BUILD="$XBPS_RUST_TARGET" # Unset cross evironment variables