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

Do not call install_name_tool for Marble library

Browse source 
Here on my Mac I had an issue that took a long time to understand.
The build.sh script was correctly creating Marble but did not
correctly run otool on it. So I fixed this by fixing CMake for
the marble library which means we don't need to worry about it
in the build script anymore.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-04-26 15:43:02 -03:00 • committed by Dirk Hohndel
parent d7e08514f1
commit 35a3ba0be0
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/build.sh
View file

@ -8,7 +8,7 @@
# /libdivecomputer # /libdivecomputer
# #
# the script will build these three libraries from source, even if # the script will build these three libraries from source, even if
# they are installed as part of the host OS since we have seen # they are installed as part of the host OS since we have seen
# numerous cases where building with random versions (especially older, # numerous cases where building with random versions (especially older,
# but sometimes also newer versions than recommended here) will lead # but sometimes also newer versions than recommended here) will lead
# to all kinds of unnecessary pain # to all kinds of unnecessary pain
@ -101,16 +101,6 @@ cd src/lib/marble
make -j4 make -j4
make install make install
if [ $PLATFORM = Darwin ] ; then
# in order for macdeployqt to do its job correctly, we need the full path in the dylib ID
cd $INSTALL_ROOT/lib
NAME=$(otool -L libssrfmarblewidget.dylib | grep -v : | head -1 | cut -f1 -d\ | tr -d '\t')
echo $NAME | grep / > /dev/null 2>&1
if [ $? -eq 1 ] ; then
install_name_tool -id "$INSTALL_ROOT/lib/$NAME" "$INSTALL_ROOT/lib/$NAME"
fi
fi
cd $SRC/subsurface cd $SRC/subsurface
mkdir -p build mkdir -p build
cd build cd build