From 45901c42fc91c1d1d46a811b9578b4d92da98135 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 14 Dec 2023 16:53:34 +0000 Subject: [PATCH] auto-patchelf: improve deprecation check by searching all elements --- pkgs/build-support/setup-hooks/auto-patchelf.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 6930fcec9d1d..9f6366b3feae 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -65,12 +65,17 @@ autoPatchelf() { local patchelfFlagsArray=($patchelfFlags) fi - if [ "$autoPatchelfIgnoreMissingDeps" == "1" ]; then - echo "autoPatchelf: WARNING: setting 'autoPatchelfIgnoreMissingDeps" \ - "= true;' is deprecated and will be removed in a future release." \ - "Use 'autoPatchelfIgnoreMissingDeps = [ \"*\" ];' instead." >&2 - ignoreMissingDepsArray=( "*" ) - fi + # Check if ignoreMissingDepsArray contains "1" and if so, replace it with + # "*", printing a deprecation warning. + for dep in "${ignoreMissingDepsArray[@]}"; do + if [ "$dep" == "1" ]; then + echo "autoPatchelf: WARNING: setting 'autoPatchelfIgnoreMissingDeps" \ + "= true;' is deprecated and will be removed in a future release." \ + "Use 'autoPatchelfIgnoreMissingDeps = [ \"*\" ];' instead." >&2 + ignoreMissingDepsArray=( "*" ) + break + fi + done @pythonInterpreter@ @autoPatchelfScript@ \ ${norecurse:+--no-recurse} \