From 3a98b8a72287d5cc5fff1e3105d64f9c7b589969 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Fri, 8 Dec 2023 14:52:14 -0800
Subject: [PATCH] more macOS build fixes

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .github/workflows/mac.yml        | 4 +++-
 packaging/macosx/make-package.sh | 8 +++++++-
 scripts/build.sh                 | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index d141572f6..92f056894 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -48,7 +48,9 @@ jobs:
       run: |
         # build export-html to make sure that didn't get broken
         cd ${GITHUB_WORKSPACE}/build
-        make export-html
+        cmake -DMAKE_TESTS=ON
+        make -j
+        make -j export-html
         echo "------------------------------------"
         echo "run tests for desktop build"
         export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index 6a1eedfe5..b533eca95 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -31,7 +31,13 @@ BASESDK=$(ls $SDKROOT | grep "MacOSX1.*\.sdk" | head -1 | sed -e "s/MacOSX//;s/\
 OLDER_MAC_CMAKE="-DCMAKE_OSX_DEPLOYMENT_TARGET=${BASESDK} -DCMAKE_OSX_SYSROOT=${SDKROOT}/MacOSX${BASESDK}.sdk/"
 export PKG_CONFIG_PATH=${DIR}/install-root/lib/pkgconfig:$PKG_CONFIG_PATH
 
-cmake $OLDER_MAC_CMAKE .
+cmake $OLDER_MAC_CMAKE \
+	-DLIBGIT2_FROM_PKGCONFIG=ON \
+	-DLIBGIT2_DYNAMIC=ON \
+	-DFTDISUPPORT=ON \
+	-DMAKE_TESTS=Off \
+	.
+
 LIBRARY_PATH=${DIR}/install-root/lib make -j
 LIBRARY_PATH=${DIR}/install-root/lib make install
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 5c6778487..f0f2b729e 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -610,7 +610,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
 		EXTRA_OPTS="-DNO_USERMANUAL=ON -DNO_PRINTING=ON"
 	fi
 	if [ "$FTDI" = "1" ] ; then
-		EXTRA_OPTSi="$EXTRA_OPTS -DFTDISUPPORT"
+		EXTRA_OPTSi="$EXTRA_OPTS -DFTDISUPPORT=ON"
 	fi
 	if [ "$BUILD_WITH_QT6" = "1" ] ; then
 		EXTRA_OPTS="$EXTRA_OPTS -DBUILD_WITH_QT6=ON"