diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-01-28 13:12:07 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-01-28 13:12:07 +0100 |
| commit | 957ed1e93eba9fb04b90350f9726b3bb2c7d8433 (patch) | |
| tree | fd6e0a0f524784f486c2bab41bd35194ef144dfd | |
| parent | a458518de9569cd36237743a54b3d40ab55e4e13 (diff) | |
| download | wireshark-notes-957ed1e93eba9fb04b90350f9726b3bb2c7d8433.tar.gz | |
sync-build.sh: remove RPATH setting
Since v2.9.1rc0-449-ga37388fbb6 it is no longer possible to override
CMAKE_INSTALL_RPATH to create relocatable build directories. An attempt
to add this feature in a generic way to older CMake versions failed, see
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15163#c12
I do not really need relocatable builds at the moment and can wait until
CMake 3.14 is released should I need it in the future.
| -rwxr-xr-x | sync-build.sh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sync-build.sh b/sync-build.sh index 73c8dcf..bcd4c47 100755 --- a/sync-build.sh +++ b/sync-build.sh @@ -75,14 +75,6 @@ if [[ ${B32:-} ]]; then CXXFLAGS="$CXXFLAGS -m32" fi -# Override RPATH to allow for relocatable executables. -# As extcap/androiddump is located in a subdir, add a special case for that. -# This is NOT suitable (safe) for release! If you ever move the "run" directory, -# be sure not to have an untrusted "extcap" directory next to it. -# This should no longer be necessary once CMAKE_BUILD_RPATH_USE_ORIGIN is set. -# See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15163#c4 -RPATH='$ORIGIN:$ORIGIN/../extcap/..' - # Set envvar force_cmake=1 to call cmake before every build if [ -n "${force_cmake:-}" ]; then force_cmake=true @@ -129,8 +121,6 @@ if $force_cmake || [ ! -e $builddir/CMakeCache.txt ]; then cmake \ -GNinja \ -DCMAKE_INSTALL_PREFIX=/tmp/wsroot \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \ - -DCMAKE_INSTALL_RPATH=$(printf %q "$RPATH") \ -DENABLE_SMI=0 \ -DCMAKE_BUILD_TYPE=Debug \ -DDISABLE_WERROR=1 \ |