Add get-dylibs script to copy homebrew libs

Author: will-v-pi

build_macos.sh

@@ -62,11 +62,18 @@ if [[ "$SKIP_OPENOCD" != 1 ]]; then
         SKIP_OPENOCD=1
     fi
     echo "OpenOCD Build Complete"
+    if [[ "$SKIP_OPENOCD" != 1 ]]; then
+        ../packages/macos/get-dylibs.sh "openocd-install-$(uname -m)"
+        echo "OpenOCD dylibs copied"
+    fi
 fi
 if [[ "$SKIP_RISCV" != 1 ]]; then
     # Takes ages to build
     ../packages/macos/riscv/build-riscv-gcc.sh
     echo "RISC-V Build Complete"
+
+    ../packages/macos/get-dylibs.sh "riscv-install-$(uname -m)"
+    echo "RISC-V dylibs copied"
 fi
 if [[ "$SKIP_PICOTOOL" != 1 ]]; then
     arch -x86_64 ../packages/macos/picotool/build-picotool.sh
@@ -75,6 +82,12 @@ if [[ "$SKIP_PICOTOOL" != 1 ]]; then
     fi
     echo "Picotool Build Complete"
 
+    ../packages/macos/get-dylibs.sh "picotool-install-x86_64"
+    if [[ $(uname -m) == 'arm64' ]]; then
+        ../packages/macos/get-dylibs.sh "picotool-install-arm64"
+    fi
+    echo "Picotool dylibs copied"
+
     ../packages/macos/make-universal.sh "pico-sdk-tools" "pioasm" "pioasm"
     echo "Pioasm Universal Merge Complete"
     ../packages/macos/make-universal.sh "picotool-install" "picotool" "picotool"

packages/macos/get-dylibs.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+INSTALLDIR=$1
+
+EXES=$(find $INSTALLDIR -type f -perm -u+x)
+LIBS=$(otool -L $EXES | grep -E "/opt/homebrew|/usr/local/opt" | grep -v python | sort | uniq | grep -o -E "/.*\.dylib")
+
+if [ ! $LIBS ]; then
+    exit 1;
+fi
+
+while IFS= read -r lib; do
+    echo
+    echo $lib
+    libname=$(echo $lib | grep -o -E "[^/]*\.dylib")
+    echo $libname
+    echo
+    while IFS= read -r exe; do
+        if file $exe | grep "Mach-O 64-bit executable" > /dev/null; then
+            if otool -L $exe | grep -o $lib > /dev/null; then
+                echo "$exe $(otool -L $exe | grep -o $lib)"
+                exedir=$(echo $exe | grep -o -E ".*/")
+                install_name_tool -change $lib @loader_path/$libname $exe
+                if ! otool -l $exe | grep "LC_RPATH" -A2 | grep "@loader_path" > /dev/null; then
+                    install_name_tool -add_rpath @loader_path/ $exe
+                fi
+                if [ ! -f $exedir$libname ]; then
+                    cp $lib $exedir$libname
+                fi
+            fi
+        fi
+    done <<< "$EXES"
+done <<< "$LIBS"

packages/macos/openocd/build-openocd.sh

@@ -13,17 +13,3 @@ make
 INSTALLDIR="$PWD/../openocd-install-$(uname -m)/usr/local/bin"
 rm -rf "$PWD/../openocd-install-$(uname -m)"
 DESTDIR="$PWD/../openocd-install-$(uname -m)" make install
-
-libusbpath=($(otool -L $INSTALLDIR/openocd | grep libusb))
-echo ${libusbpath[0]}
-cp "${libusbpath[0]}" $INSTALLDIR/libusb-1.0.dylib
-install_name_tool -change "${libusbpath[0]}" @loader_path/libusb-1.0.dylib $INSTALLDIR/openocd
-libhidpath=($(otool -L $INSTALLDIR/openocd | grep libhidapi))
-echo ${libhidpath[0]}
-cp "${libhidpath[0]}" $INSTALLDIR/libhidapi.dylib
-install_name_tool -change "${libhidpath[0]}" @loader_path/libhidapi.dylib $INSTALLDIR/openocd
-libjimpath=($(otool -L $INSTALLDIR/openocd | grep libjim))
-echo ${libjimpath[0]}
-cp "${libjimpath[0]}" $INSTALLDIR/libjim0.83.dylib
-install_name_tool -change "${libjimpath[0]}" @loader_path/libjim0.83.dylib $INSTALLDIR/openocd
-install_name_tool -add_rpath @loader_path/ $INSTALLDIR/openocd

packages/macos/picotool/build-picotool.sh

@@ -35,9 +35,3 @@ rm -rf $INSTALLDIR
 mkdir -p $INSTALLDIR
 cmake --install picotool/build/ --prefix $INSTALLDIR
 touch $INSTALLDIR/.keep
-
-libpath=($(otool -L $INSTALLDIR/picotool/picotool | grep libusb))
-echo ${libpath[0]}
-cp "${libpath[0]}" $INSTALLDIR/picotool/libusb-1.0.dylib
-install_name_tool -change "${libpath[0]}" @loader_path/libusb-1.0.dylib $INSTALLDIR/picotool/picotool
-install_name_tool -add_rpath @loader_path/ $INSTALLDIR/picotool/picotool