Wireshark-commits: [Wireshark-commits] master-2.6 57d4136: Fix liblzma, liblz4, and libssh builds w
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: Sat, 23 Feb 2019 19:22:19 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=57d413619afdca4dd2f9e78ff4c9a135d9875c23
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

57d4136 by Guy Harris (guy@xxxxxxxxxxxx):

    Fix liblzma, liblz4, and libssh builds with minimum deployment version and SDK.
    
    liblzma is used by libxml2, which is used by libwireshark, so we need
    it.  It's build by xz, so we need to do the xz build with the
    minimum-version and SDK flags.
    
    liblz4 does its builds in its own unique way; it appears we need to set
    MOREFLAGS to include the relevant flas.
    
    libssh is built with CMake, so you have to do special magic to set the
    SDK path; do it by running cmake with the MACOSX_DEPLOYMENT_TARGET and
    SDKROOT environment variables.
    
    Change-Id: Ia588632e5047c4a8a22fe6ef3a0844cfe7722df2
    Reviewed-on: https://code.wireshark.org/review/32171
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 1048b82ca34ce9e3cdd128e6883a27a76bff3ab7)
    Reviewed-on: https://code.wireshark.org/review/32173
    

Actions performed:

    from  898e3f4   Add -D_FORTIFY_SOURCE=0 for C++ if we're using it for C.
     add  57d4136   Fix liblzma, liblz4, and libssh builds with minimum deployment version and SDK.


Summary of changes:
 tools/macos-setup.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)