diff options
| author |  Tomaz Canabrava <tomaz.canabrava@gmail.com> | 2015-04-26 15:43:02 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-04-26 12:18:14 -0700 |
| commit | 35a3ba0be01bb8e71baea5ff36433c8398cf91c0 (patch) | |
| tree | cf9cb04a90a83666a0a6f62493f8f2474dfefa79 | |
| parent | d7e08514f118fa5d3421c9edac686e2e1c420f52 (diff) | |
| download | subsurface-35a3ba0be01bb8e71baea5ff36433c8398cf91c0.tar.gz | |
Do not call install_name_tool for Marble library
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>
| -rwxr-xr-x | scripts/build.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 812afd762..20892691d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -8,7 +8,7 @@ # /libdivecomputer # # 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, # but sometimes also newer versions than recommended here) will lead # to all kinds of unnecessary pain @@ -101,16 +101,6 @@ cd src/lib/marble make -j4 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 mkdir -p build cd build |