From 58335bd86c393943ebb164182f851373d927847e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 18 Oct 2016 15:27:37 +0200 Subject: Packaging: Add dependencies for lz4 and snappy packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet Signed-off-by: Alexis La Goutte Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet Petri-Dish: Alexis La Goutte Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss Reviewed-by: Dario Lombardo --- tools/debian-setup.sh | 3 ++- tools/install_rpms_for_devel.sh | 13 ++++++++++++- tools/macos-setup-brew.sh | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index aeb03d1472..a762800da7 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -40,7 +40,8 @@ ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \ libc-ares-dev libssh-dev libkrb5-dev libqt5svg5-dev lynx libsmi2-dev \ portaudio19-dev asciidoc libgcrypt-dev libsbc-dev libgeoip-dev \ libgnutls-dev qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \ - libparse-yapp-perl qt5-default cmake libcap-dev libssh-gcrypt-dev" + libparse-yapp-perl qt5-default cmake libcap-dev libssh-gcrypt-dev \ + liblz4-dev libsnappy-dev" # Check for lsb_release command in $PATH if ! which lsb_release > /dev/null; then diff --git a/tools/install_rpms_for_devel.sh b/tools/install_rpms_for_devel.sh index 5eb021723c..54be6d0509 100755 --- a/tools/install_rpms_for_devel.sh +++ b/tools/install_rpms_for_devel.sh @@ -37,7 +37,14 @@ then GLIB2="glib2-devel libglib-2_0-0" PCAP="libpcap-devel libpcap1" ZLIB="zlib-devel libz1" + SNAPPY="snappy-devel libsnappy1" + # The runtime package name changes with the version. Just pull it + # in through the -devel package. + LZ4="liblz4-devel" CARES="libcares-devel libcares2" + NGHTTP2="nghttp2" + # SUSE doesn't split the pod2* commands into a separate package like RH + PERLPODS="" else if [ ! -r /etc/redhat-release ] then @@ -57,12 +64,16 @@ else GLIB2="glib2-devel glib2" PCAP="libpcap-devel libpcap" ZLIB="zlib-devel zlib" + SNAPPY="snappy-devel snappy" + LZ4="lz4 lz4-devel" # May need to enable EPEL CARES="c-ares-devel c-ares" + NGHTTP2="libnghttp2" + PERLPODS="perl-podlators" fi PKGS="autoconf automake libtool gcc flex bison python perl $GLIB2 $PCAP $ZLIB lua-devel lua $CARES $GTK3 $GTK2 desktop-file-utils $QT fop -asciidoc git git-review perl-podlators libnghttp2-devel libnghttp2" +asciidoc git git-review $PERLPODS libnghttp2-devel $NGHTTP2 $SNAPPY $LZ4" echo "Run this command (as root):" echo diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh index cc6476cbed..d6403bff72 100755 --- a/tools/macos-setup-brew.sh +++ b/tools/macos-setup-brew.sh @@ -25,7 +25,7 @@ brew update #install some lib need by Wireshark -brew install c-ares glib gnutls lua cmake nghttp2 +brew install c-ares glib gnutls lua cmake nghttp2 snappy lz4 #install Qt5 brew install qt5 -- cgit v1.2.3