From e6ac0665c7f124e56915630e46dcd70dc95bef38 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 12 Sep 2020 17:33:37 -0700 Subject: [PATCH] build-system/macOS: build libz and libftdi as part of Mac dependencies Usually people will install these via Homebrew, but when we need to build everything ourselves (required for release binaries), then these two were missing before. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index 83923744e..a6bfd65b4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -280,6 +280,20 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then # because that always requires the latest OS (how stupid is that - and they consider it a # feature). So we painfully need to build the dependencies ourselves. cd "$SRC" + + ./${SRC_DIR}/scripts/get-dep-lib.sh single . libz + pushd libz + # no, don't install pkgconfig files in .../libs/share/pkgconf - that's just weird + sed -i .bak 's/share\/pkgconfig/pkgconfig/' CMakeLists.txt + mkdir -p build + cd build + cmake "$OLDER_MAC_CMAKE" -DCMAKE_BUILD_TYPE="$DEBUGRELEASE" \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \ + .. + make -j4 + make install + popd + ./${SRC_DIR}/scripts/get-dep-lib.sh single . libcurl pushd libcurl bash ./buildconf @@ -380,6 +394,17 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then make -j4 make install popd + + ./${SRC_DIR}/scripts/get-dep-lib.sh single . libftdi1 + pushd libftdi1 + mkdir -p build + cd build + cmake "$OLDER_MAC_CMAKE" -DCMAKE_BUILD_TYPE="$DEBUGRELEASE" \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \ + .. + make -j4 + make install + popd fi