mac: fix seutptools plugins warning for bundle

jtanx · jtanx · commit f1492c937479 · 2021-10-03T16:56:36.000+08:00
diff --git a/.github/workflows/scripts/ffosxbuild.sh b/.github/workflows/scripts/ffosxbuild.sh
@@ -45,6 +45,10 @@ rm site-packages || rm -rf site-packages
 ln -s ../../../../../../Resources/opt/local/lib/$PYTHON/site-packages
 popd
 
+pushd $APPDIR/Contents/Resources/opt/local/lib/$PYTHON/site-packages
+cp -Rn "$pycruft/Python.framework/Versions/$PYVER/lib/$PYTHON/site-packages/" .
+popd
+
 find "$APPDIR/Contents/Frameworks/Python.framework" -type f -name '*.pyc' | xargs rm -rf
 
 pushd $APPDIR/Contents/Resources/opt/local
@@ -54,6 +58,7 @@ $LDDX --overwrite --modify-special-paths --recursive --ignore-prefix /opt/X11 --
 popd
 
 mkdir -p $APPDIR/Contents/MacOS
+ln -s ../Frameworks/Python.framework/Versions/$PYVER/bin/$PYTHON "$APPDIR/Contents/MacOS/FFPython"
 
 # Package it up
 if [ ! -z "$CI" ]; then
diff --git a/cmake/BuildUtils.cmake b/cmake/BuildUtils.cmake
@@ -110,6 +110,7 @@ function(set_default_rpath)
   endif()
   if(APPLE)
     list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../lib")
+    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../..") # For fontforge.so
   endif()
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} PARENT_SCOPE)
 endfunction()
