Wireshark · Wireshark-commits: [Wireshark-commits] master 9f03aa1: On OS X, add an rpath for the Qt frameworks, and remove it in th

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9f03aa131e851447f6c3a89b6e57ff560df0afe2
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

9f03aa1 by Guy Harris (guy@xxxxxxxxxxxx):

    On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.
    
    Qt 5.5 and later have @rpath-based install names for the frameworks,
    which means that, if they're not installed in some frameworks directory
    searched by default (such as /Library/Frameworks) - which is the default
    case with the Qt installer - they won't be found by default.
    
    Add the directory in which the frameworks exist as an rpath in the
    Wireshark binary, so that they'll be found, and then remove it from the
    Wireshark binary in the app bundle, as the directory in which the
    frameworks exist on the machine on which Wireshark was built is
    irrelevant to the machines on which it's being deployed - the frameworks
    are included in the bundle, and we already add an rpath to find them
    there.
    
    Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78
    Reviewed-on: https://code.wireshark.org/review/9625
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  7b9b3d4   Go back to using macdeployqt for now.
    adds  9f03aa1   On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.


Summary of changes:
 Makefile.am                 |    2 +-
 configure.ac                |   22 +++++++++++++++++++++-
 packaging/macosx/osx-app.sh |   21 +++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)