Wireshark-commits: [Wireshark-commits] master a544570: Fix build with non-standard install prefix

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 19 Sep 2019 18:51:33 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a5445705469d2daa152935c96860fcc7d3269b26
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

a544570 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>
    

Actions performed:

    from  a97c157   macos-setup: Add minizip.
     add  a544570   Fix build with non-standard install prefix


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