Wireshark-commits: [Wireshark-commits] master-3.0 21f80b6: Fix build with non-standard install pref
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 20 Sep 2019 16:19:18 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=21f80b628800a44669b67c392509bf737a579264
Submitter: "João Valverde <j@xxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

21f80b6 by João Valverde (joao.valverde@xxxxxxxxxxxxxxxxxx):

    Fix build with non-standard install prefix
    
    The variables BUILD_dumpcap and PCAP_FOUND are defined after the if
    condition, therefore wireshark is built with a relative RPATH and
    library loading for privileged processes fails with glibc.
    
    Move the definition of BUILD_dumpcap before it is used and drop
    the test for PCAP_FOUND.
    
    Move a comment to the proper line while at it.
    
    Change-Id: Ie151a3781898e712f9e324e9ef995022bbea40b6
    Reviewed-on: https://code.wireshark.org/review/34564
    Petri-Dish: João Valverde <j@xxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/34572
    Reviewed-by: João Valverde <j@xxxxxx>
    

Actions performed:

    from  6d452f0   NSIS: Tell the user to uninstall Npcap 0.99[45] manually.
     add  21f80b6   Fix build with non-standard install prefix


Summary of changes:
 CMakeLists.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)