Fix mod bootstrap for macOS

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Oct 7, 2023 · e73506c · e73506c
1 parent 8f1ad5b
commit e73506c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bootstrap-mod.sh b/bootstrap-mod.sh
@@ -204,7 +204,10 @@ PILLOW_EXTRAFLAGS+=" --disable-tiff"
 PILLOW_EXTRAFLAGS+=" --disable-webp"
 PILLOW_EXTRAFLAGS+=" --disable-webpmux"
 PILLOW_EXTRAFLAGS+=" --disable-xcb"
-PILLOW_EXTRAFLAGS+=" --disable-platform-guessing"
+
+if [ "${WIN32}" -eq 1 ] && [ "${CROSS_COMPILING}" -eq 1 ]; then
+    PILLOW_EXTRAFLAGS+=" --disable-platform-guessing"
+fi
 
 download Pillow "${PILLOW_VERSION}" "https://files.pythonhosted.org/packages/21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f"
 build_python Pillow "${PILLOW_VERSION}" "${PILLOW_EXTRAFLAGS}"

diff --git a/setup/functions.sh b/setup/functions.sh
@@ -488,7 +488,7 @@ function build_python() {
         pushd "${pkgdir}"
         # always try twice, python checks for installed deps and fails the first time
         ${python} setup.py install --prefix="${PAWPAW_PREFIX}" --verbose || \
-        ${python} setup.py install --prefix="${PAWPAW_PREFIX}" --verbose
+        ${python} setup.py install --prefix="${PAWPAW_PREFIX}" --verbose || true
         touch .stamp_installed
         popd
     fi