diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2020-09-12 17:33:37 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-09-13 13:55:46 -0700 |
commit | e6ac0665c7f124e56915630e46dcd70dc95bef38 (patch) | |
tree | a24b65f345dea11c323780405ecea1dcdba78a54 | |
parent | 605ce56ea226c629d3e6a8ba304799655a0b1140 (diff) | |
download | subsurface-e6ac0665c7f124e56915630e46dcd70dc95bef38.tar.gz |
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 <dirk@hohndel.org>
-rwxr-xr-x | scripts/build.sh | 25 |
1 files changed, 25 insertions, 0 deletions
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 |