From 30a750c9bcccf3e8fa8fddb0fd64004aff37813e Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Sat, 7 Oct 2023 15:29:49 -0400 Subject: [PATCH] Fix broken Mac packages - only fixup binaries at the end Signed-off-by: Geoff Hutchison --- .github/workflows/build_cmake.yml | 16 ++++++++-------- .github/workflows/build_m1.yml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 2245e0b1cb..566f526ac1 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -194,14 +194,14 @@ jobs: otool -L libinchi.?.?.?.dylib cp -p libinchi* ../Avogadro2.app/Contents/Frameworks/ # finally, fixup the binaries - cd ../bin - for exe in obabel obmm eht_bind genXrdPattern; do - for libpath in `otool -L ${exe} | grep '/Users/runner/work' | awk '{print $1}'`; do - export lib=`echo $libpath | cut -d '/' -f 9`; - echo "Fixing $exe $lib $libpath" - install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe - done - done + #cd ../bin + #for exe in obabel obmm eht_bind genXrdPattern; do + # for libpath in `otool -L ${exe} | grep '/Users/runner/work' | awk '{print $1}'`; do + # export lib=`echo $libpath | cut -d '/' -f 9`; + # echo "Fixing $exe $lib $libpath" + # install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe + # done + #done - name: Run tests if: matrix.config.os == 'ubuntu-20.04' diff --git a/.github/workflows/build_m1.yml b/.github/workflows/build_m1.yml index 8da270d647..746e8dc2b3 100644 --- a/.github/workflows/build_m1.yml +++ b/.github/workflows/build_m1.yml @@ -101,14 +101,14 @@ jobs: otool -L libinchi.?.?.?.dylib cp -p libinchi* ../Avogadro2.app/Contents/Frameworks/ # finally, fixup the binaries - cd ../bin - for exe in obabel obmm eht_bind genXrdPattern; do - for libpath in `otool -L ${exe} | grep '/Users/runner' | awk '{print $1}'`; do - export lib=`echo $libpath | cut -d '/' -f 10`; - echo "Fixing $exe $lib $libpath" - install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe - done - done + #cd ../bin + #for exe in obabel obmm eht_bind genXrdPattern; do + # for libpath in `otool -L ${exe} | grep '/Users/runner' | awk '{print $1}'`; do + # export lib=`echo $libpath | cut -d '/' -f 10`; + # echo "Fixing $exe $lib $libpath" + # install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe + # done + #done - name: Install the Apple certificate