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

build-system/macOS: don't get libgit2 from pkgconfig when building it ourselves

Browse source 
Doing that confuses the build setup and as a result the library isn't found at
runtime without some fixups.

Fixes #1469

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-07-07 10:26:31 -07:00
parent 5c403edf79
commit 2de5b95acf
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/build.sh
View file

@ -177,7 +177,12 @@ fi
# set up the right file name extensions # set up the right file name extensions
if [ $PLATFORM = Darwin ] ; then if [ $PLATFORM = Darwin ] ; then
SH_LIB_EXT=dylib SH_LIB_EXT=dylib
pkg-config --exists libgit2 && LIBGIT=$(pkg-config --modversion libgit2 | cut -d. -f2) if [ ! "$BUILD_DEPS" == "1" ] ; then
pkg-config --exists libgit2 && LIBGIT=$(pkg-config --modversion libgit2 | cut -d. -f2)
if [[ "$LIBGIT" > "23" ]] ; then
LIBGIT2_FROM_PKGCONFIG="-DLIBGIT2_FROM_PKGCONFIG=ON"
fi
fi
else else
SH_LIB_EXT=so SH_LIB_EXT=so
@ -187,6 +192,7 @@ else
# this script has been run before) # this script has been run before)
if pkg-config --exists libgit2 ; then if pkg-config --exists libgit2 ; then
LIBGIT=$(pkg-config --modversion libgit2 | cut -d. -f2) LIBGIT=$(pkg-config --modversion libgit2 | cut -d. -f2)
LIBGIT2_FROM_PKGCONFIG="-DLIBGIT2_FROM_PKGCONFIG=ON"
fi fi
if [[ "$LIBGIT" < "24" ]] ; then if [[ "$LIBGIT" < "24" ]] ; then
# maybe there's a system version that's new enough? # maybe there's a system version that's new enough?
@ -464,7 +470,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
-DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \ -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \
-DBTSUPPORT=${BTSUPPORT} \ -DBTSUPPORT=${BTSUPPORT} \
-DCMAKE_INSTALL_PREFIX=${INSTALL_ROOT} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_ROOT} \
-DLIBGIT2_FROM_PKGCONFIG=ON \ $LIBGIT2_FROM_PKGCONFIG \
-DFORCE_LIBSSH=OFF \ -DFORCE_LIBSSH=OFF \
$PRINTING $EXTRA_OPTS $PRINTING $EXTRA_OPTS