Wireshark · Wireshark-commits: [Wireshark-commits] master-2.0 61640df: osx-app.sh fixups.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=61640df156f343a8108d76f845e61b4e8755879b
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

61640df by Gerald Combs (gerald@xxxxxxxxxxxxx):

    osx-app.sh fixups.
    
    For libraries, instead of prefixing dependent library paths with
    @executable_path/../Framework, prefix them with @rpath. This should let
    us load them from different directory depths.
    
    Remove any LC_RPATH not in an allowed list of prefixes. This should keep
    us from leaking paths specific to the build environment and user, and
    should make any portability problems more obvious.
    
    Add either @executable_path/../Frameworks or
    @executable_path/../../Frameworks as an LC_RPATH depending on which
    actually exists. This lets us place androiddump in the extcap
    subdirectory.
    
    Add error checking in a few places and make sure we detect failures in
    subshells.
    
    Add a macdeployqt buglink.
    
    Bug: 11620
    Change-Id: I43ef02ecc6f741761fcb9827c0b0b7b2ef16fa9a
    Reviewed-on: https://code.wireshark.org/review/11205
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 1c2ed18723f9238e3537119e88b2b5da70014225)
    Reviewed-on: https://code.wireshark.org/review/11212
    

Actions performed:

    from  d016c20   Avoid adding -pie on older cmake versions
    adds  61640df   osx-app.sh fixups.


Summary of changes:
 packaging/macosx/osx-app.sh |  206 +++++++++++++++++++++++++++----------------
 1 file changed, 129 insertions(+), 77 deletions(-)