tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

common: unser PKG_CONFIG before sourcing templates, set PKG_CONFIG also for native

Browse Source
This commit is contained in:
John
2020-05-29 14:30:06 +02:00
parent 6c2e984eb7
commit 6ce531b231
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/environment/setup/sourcepkg.sh
View File

@@ -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 reverts subpackages makedepends hostmakedepends checkdepends depends restricted
unset -v nopie build_options build_options_default bootstrap repository reverts 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 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 # hooks/do-extract/00-distfiles
unset -v skip_extraction unset -v skip_extraction

1
common/xbps-src/shutils/common.sh
View File

@@ -606,6 +606,7 @@ setup_pkg() {
export OBJCOPY="objcopy" export OBJCOPY="objcopy"
export NM="nm" export NM="nm"
export READELF="readelf" export READELF="readelf"
export PKG_CONFIG="pkg-config"
export RUST_TARGET="$XBPS_RUST_TARGET" export RUST_TARGET="$XBPS_RUST_TARGET"
export RUST_BUILD="$XBPS_RUST_TARGET" export RUST_BUILD="$XBPS_RUST_TARGET"
# Unset cross evironment variables # Unset cross evironment variables