From 289de5a1585195ec3cbef2654907369b4a933512 Mon Sep 17 00:00:00 2001
From: Timo Wilken <timo.wilken@cern.ch>
Date: Wed, 10 Nov 2021 15:49:07 +0000
Subject: [PATCH] Fix relocation of libs with multiple LC_RPATH entries (#727)

Some libraries built on OSX can have LC_RPATH entries for multiple
architectures. In that case, they'll have the same rpath multiple times, but a
single `install_name_tool` call will change all of them, and subsequent calls
will fail.

Instead, only consider each unique rpath only once.
---
 alibuild_helpers/build_template.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alibuild_helpers/build_template.sh b/alibuild_helpers/build_template.sh
index 4657f042..e01319b8 100644
--- a/alibuild_helpers/build_template.sh
+++ b/alibuild_helpers/build_template.sh
@@ -235,7 +235,7 @@ EOF
       # Both libs and binaries: relocate LC_RPATH
       if otool -l "$PWD/$BIN" 2> /dev/null | grep -A2 LC_RPATH | grep path | grep -q $PKGHASH; then
         cat <<EOF >> "$INSTALLROOT/relocate-me.sh"
-OLD_RPATHS=\$(otool -l \$PP/$BIN | grep -A2 LC_RPATH | grep path | grep \$PH | sed -e 's|^.*path ||' -e 's| .*$||')
+OLD_RPATHS=\$(otool -l \$PP/$BIN | grep -A2 LC_RPATH | grep path | grep \$PH | sed -e 's|^.*path ||' -e 's| .*$||' | sort -u)
 for OLD_RPATH in \$OLD_RPATHS; do
   NEW_RPATH=\${OLD_RPATH/#*INSTALLROOT\/\$PH\/\$OP/\$WORK_DIR/\$PP}
   install_name_tool -rpath "\$OLD_RPATH" "\$NEW_RPATH" "\$PP/$BIN"
@@ -246,7 +246,7 @@ EOF
       # Both libs and binaries: relocate LC_LOAD_DYLIB
       if otool -l "$PWD/$BIN" 2> /dev/null | grep -A2 LC_LOAD_DYLIB | grep name | grep -q $PKGHASH; then
         cat <<EOF >> "$INSTALLROOT/relocate-me.sh"
-OLD_LOAD_DYLIBS=\$(otool -l \$PP/$BIN | grep -A2 LC_LOAD_DYLIB | grep name | grep \$PH | sed -e 's|^.*name ||' -e 's| .*$||')
+OLD_LOAD_DYLIBS=\$(otool -l \$PP/$BIN | grep -A2 LC_LOAD_DYLIB | grep name | grep \$PH | sed -e 's|^.*name ||' -e 's| .*$||' | sort -u)
 for OLD_LOAD_DYLIB in \$OLD_LOAD_DYLIBS; do
   NEW_LOAD_DYLIB=\${OLD_LOAD_DYLIB/#*INSTALLROOT\/\$PH\/\$OP/\$WORK_DIR/\$PP}
   install_name_tool -change "\$OLD_LOAD_DYLIB" "\$NEW_LOAD_DYLIB" "\$PP/$BIN"