mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

macOS: reorder build of dependencies

Browse source 
libcurl needs openssl.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2024-09-08 19:08:47 -07:00
parent f585726283
commit 57cc6a8c04
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scripts/build.sh
View file

@ -376,17 +376,6 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then
make install make install
popd popd
./${SRC_DIR}/scripts/get-dep-lib.sh single . libcurl
pushd libcurl
bash ./buildconf
mkdir -p build
cd build
CFLAGS="$MAC_OPTS" ../configure --prefix="$INSTALL_ROOT" --with-openssl \
--disable-tftp --disable-ftp --disable-ldap --disable-ldaps --disable-imap --disable-pop3 --disable-smtp --disable-gopher --disable-smb --disable-rtsp
make -j4
make install
popd
# openssl doesn't support fat binaries out of the box # openssl doesn't support fat binaries out of the box
# this tries to hack around this by first doing an install for x86_64, then a build for arm64 # this tries to hack around this by first doing an install for x86_64, then a build for arm64
# and then manually creating fat libraries from that # and then manually creating fat libraries from that
@ -416,6 +405,17 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then
fi fi
popd popd
./${SRC_DIR}/scripts/get-dep-lib.sh single . libcurl
pushd libcurl
bash ./buildconf
mkdir -p build
cd build
CFLAGS="$MAC_OPTS" ../configure --prefix="$INSTALL_ROOT" --with-openssl \
--disable-tftp --disable-ftp --disable-ldap --disable-ldaps --disable-imap --disable-pop3 --disable-smtp --disable-gopher --disable-smb --disable-rtsp
make -j4
make install
popd
./${SRC_DIR}/scripts/get-dep-lib.sh single . libssh2 ./${SRC_DIR}/scripts/get-dep-lib.sh single . libssh2
pushd libssh2 pushd libssh2
mkdir -p build mkdir -p build