
Previously, mangleVarList would be used which would concatenate the variables using a space as a separator. Paths are however separated by `:` in PKG_CONFIG_PATH leading to entries being broken. This is fixed by introducing mangleVarListGeneric which allows us to specify the desired separator. Reproducer for the issue prior to this change: $ nix-shell -A pkgsLLVM.wayland [nix-shell] $ pkg-config --libs expat Package expat was not found in the pkg-config search path. Perhaps you should add the directory containing `expat.pc' to the PKG_CONFIG_PATH environment variable No package 'expat' found $ printf 'Host: %s\nBuild: %s' $PKG_CONFIG_PATH $PKG_CONFIG_PATH_FOR_BUILD Host: /nix/store/5h308a4ab8w7prcp8iflh5pnl78mayi2-expat-2.2.10-x86_64-unknown-linux-gnu-dev/lib/pkgconfig:/nix/store/z3y9ska2h4l1map25m195iq577g7g3gz-libxml2-x86_64-unknown-linux-gnu-2.9.12-dev/lib/pkgconfig:/nix/store/lbz5m1s0r7zn0cxvl21czfspli6ribzb-zlib-1.2.11-x86_64-unknown-linux-gnu-dev/lib/pkgconfig:/nix/store/rfhvp8r8n3ygpzh8j0l34lk8hwwi3z0h-libffi-3.3-x86_64-unknown-linux-gnu-dev/lib/pkgconfig Build: /nix/store/dw11ywy7qwfz53qisz0dggbgix88jah2-wayland-1.19.0-bin/lib/pkgconfig strace reveals the issue: stat("/nix/store/dw11ywy7qwfz53qisz0dggbgix88jah2-wayland-1.19.0-bin/lib/pkgconfig /nix/store/5h308a4ab8w7prcp8iflh5pnl78mayi2-expat-2.2.10-x86_64-unknown-linux-gnu-dev/lib/pkgconfig/expat-uninstalled.pc", 0x7fff49829fa0) = -1 ENOENT (No such file or directory) In the pkg-config wrapper $PKG_CONFIG_PATH_FOR_BUILD and $PKG_CONFIG_PATH are concatenated with a space which leads to two paths being messed up. This issue likely only affects native cross compilation. (cherry picked from commit b11d65c8508542efbd161c5922d51b55b431fe90)
132 lines
4.0 KiB
Bash
132 lines
4.0 KiB
Bash
# Accumulate suffixes for taking in the right input parameters with the `mangle*`
|
|
# functions below. See setup-hook for details.
|
|
accumulateRoles() {
|
|
declare -ga role_suffixes=()
|
|
if [ "${NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@:-}" ]; then
|
|
role_suffixes+=('_FOR_BUILD')
|
|
fi
|
|
if [ "${NIX_@wrapperName@_TARGET_HOST_@suffixSalt@:-}" ]; then
|
|
role_suffixes+=('')
|
|
fi
|
|
if [ "${NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@:-}" ]; then
|
|
role_suffixes+=('_FOR_TARGET')
|
|
fi
|
|
}
|
|
|
|
mangleVarListGeneric() {
|
|
local sep="$1"
|
|
shift
|
|
local var="$1"
|
|
shift
|
|
local -a role_suffixes=("$@")
|
|
|
|
local outputVar="${var}_@suffixSalt@"
|
|
declare -gx ${outputVar}+=''
|
|
# For each role we serve, we accumulate the input parameters into our own
|
|
# cc-wrapper-derivation-specific environment variables.
|
|
for suffix in "${role_suffixes[@]}"; do
|
|
local inputVar="${var}${suffix}"
|
|
if [ -v "$inputVar" ]; then
|
|
export ${outputVar}+="${!outputVar:+$sep}${!inputVar}"
|
|
fi
|
|
done
|
|
}
|
|
|
|
mangleVarList() {
|
|
mangleVarListGeneric " " "$@"
|
|
}
|
|
|
|
mangleVarBool() {
|
|
local var="$1"
|
|
shift
|
|
local -a role_suffixes=("$@")
|
|
|
|
local outputVar="${var}_@suffixSalt@"
|
|
declare -gxi ${outputVar}+=0
|
|
for suffix in "${role_suffixes[@]}"; do
|
|
local inputVar="${var}${suffix}"
|
|
if [ -v "$inputVar" ]; then
|
|
# "1" in the end makes `let` return success error code when
|
|
# expression itself evaluates to zero.
|
|
# We don't use `|| true` because that would silence actual
|
|
# syntax errors from bad variable values.
|
|
let "${outputVar} |= ${!inputVar:-0}" "1"
|
|
fi
|
|
done
|
|
}
|
|
|
|
# Combine a singular value from all roles. If multiple roles are being served,
|
|
# and the value differs in these roles then the request is impossible to
|
|
# satisfy and we abort immediately.
|
|
mangleVarSingle() {
|
|
local var="$1"
|
|
shift
|
|
local -a role_suffixes=("$@")
|
|
|
|
local outputVar="${var}_@suffixSalt@"
|
|
for suffix in "${role_suffixes[@]}"; do
|
|
local inputVar="${var}${suffix}"
|
|
if [ -v "$inputVar" ]; then
|
|
if [ -v "$outputVar" ]; then
|
|
if [ "${!outputVar}" != "${!inputVar}" ]; then
|
|
{
|
|
echo "Multiple conflicting values defined for $outputVar"
|
|
echo "Existing value is ${!outputVar}"
|
|
echo "Attempting to set to ${!inputVar} via $inputVar"
|
|
} >&2
|
|
|
|
exit 1
|
|
fi
|
|
else
|
|
declare -gx ${outputVar}="${!inputVar}"
|
|
fi
|
|
fi
|
|
done
|
|
}
|
|
|
|
skip () {
|
|
if (( "${NIX_DEBUG:-0}" >= 1 )); then
|
|
echo "skipping impure path $1" >&2
|
|
fi
|
|
}
|
|
|
|
|
|
# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but
|
|
# `/nix/store/.../lib/foo.so' isn't.
|
|
badPath() {
|
|
local p=$1
|
|
|
|
# Relative paths are okay (since they're presumably relative to
|
|
# the temporary build directory).
|
|
if [ "${p:0:1}" != / ]; then return 1; fi
|
|
|
|
# Otherwise, the path should refer to the store or some temporary
|
|
# directory (including the build directory).
|
|
test \
|
|
"$p" != "/dev/null" -a \
|
|
"${p#${NIX_STORE}}" = "$p" -a \
|
|
"${p#${NIX_BUILD_TOP}}" = "$p" -a \
|
|
"${p#/tmp}" = "$p" -a \
|
|
"${p#${TMP:-/tmp}}" = "$p" -a \
|
|
"${p#${TMPDIR:-/tmp}}" = "$p" -a \
|
|
"${p#${TEMP:-/tmp}}" = "$p" -a \
|
|
"${p#${TEMPDIR:-/tmp}}" = "$p"
|
|
}
|
|
|
|
expandResponseParams() {
|
|
declare -ga params=("$@")
|
|
local arg
|
|
for arg in "$@"; do
|
|
if [[ "$arg" == @* ]]; then
|
|
# phase separation makes this look useless
|
|
# shellcheck disable=SC2157
|
|
if [ -x "@expandResponseParams@" ]; then
|
|
# params is used by caller
|
|
#shellcheck disable=SC2034
|
|
readarray -d '' params < <("@expandResponseParams@" "$@")
|
|
return 0
|
|
fi
|
|
fi
|
|
done
|
|
}
|