mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-08 17:39:24 +00:00
wireshark: upgrade to 3.0.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
ec3307cebe
commit
0248b3ee2b
-29
@@ -1,29 +0,0 @@
|
|||||||
From 1a6a5d2bcb1adec9ba138c2ebee7bbc994620aff Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Tue, 12 Jun 2018 23:23:44 -0700
|
|
||||||
Subject: [PATCH] Add libm to link for fmod() API
|
|
||||||
|
|
||||||
fixes
|
|
||||||
ld: CMakeFiles/tshark.dir/ui/cli/tap-comparestat.c.o: undefined reference to symbol 'fmod@@GLIBC_2.2.5'
|
|
||||||
| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/wireshark/1_2.6.1-r0/recipe-sysroot/lib/libm.so.6: error adding symbols: DSO missing from command line
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 7950e85..acee140 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -2494,6 +2494,7 @@ if(BUILD_tshark)
|
|
||||||
${LIBEPAN_LIBS}
|
|
||||||
${APPLE_CORE_FOUNDATION_LIBRARY}
|
|
||||||
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
|
|
||||||
+ m
|
|
||||||
)
|
|
||||||
set(tshark_FILES
|
|
||||||
capture_opts.c
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@@ -4,7 +4,7 @@ SECTION = "net"
|
|||||||
LICENSE = "GPL-2.0"
|
LICENSE = "GPL-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77"
|
||||||
|
|
||||||
DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native git"
|
DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native"
|
||||||
|
|
||||||
DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
|
DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
|
||||||
|
|
||||||
@@ -21,11 +21,7 @@ inherit cmake pkgconfig python3native perlnative upstream-version-is-even
|
|||||||
|
|
||||||
ARM_INSTRUCTION_SET = "arm"
|
ARM_INSTRUCTION_SET = "arm"
|
||||||
|
|
||||||
# Options: gtk+, gtk+3 and qt5
|
|
||||||
GTK = "gtk+3"
|
|
||||||
|
|
||||||
PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
|
PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
|
||||||
PACKAGECONFIG_append_class-target = " ${@bb.utils.contains("DISTRO_FEATURES", "x11", " ${GTK}", "", d)}"
|
|
||||||
|
|
||||||
PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
|
PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
|
||||||
|
|
||||||
@@ -34,8 +30,6 @@ PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DE
|
|||||||
PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi"
|
PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi"
|
||||||
PACKAGECONFIG[libnl] = ",,libnl"
|
PACKAGECONFIG[libnl] = ",,libnl"
|
||||||
PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19"
|
PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19"
|
||||||
PACKAGECONFIG[gtk+] = "-DENABLE_GTK=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK=OFF, gtk+"
|
|
||||||
PACKAGECONFIG[gtk+3] = "-DENABLE_GTK3=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK3=OFF, gtk+3"
|
|
||||||
PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls"
|
PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls"
|
||||||
PACKAGECONFIG[ssl] = ",,openssl"
|
PACKAGECONFIG[ssl] = ",,openssl"
|
||||||
PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5"
|
PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5"
|
||||||
@@ -77,16 +71,11 @@ do_install_append_class-target() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
PACKAGE_BEFORE_PN += "tshark"
|
PACKAGE_BEFORE_PN += "tshark"
|
||||||
PACKAGE_BEFORE_PN += "${PN}-gtk"
|
|
||||||
|
|
||||||
FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*"
|
FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*"
|
||||||
FILES_${PN}-gtk = "${bindir}/wireshark-gtk ${datadir}/icons ${datadir}/appdata \
|
|
||||||
${datadir}/applications ${datadir}/wireshark ${datadir}/mime \
|
|
||||||
${mandir}/man1/wireshark.* "
|
|
||||||
|
|
||||||
FILES_${PN} += "${datadir}*"
|
FILES_${PN} += "${datadir}*"
|
||||||
|
|
||||||
RDEPENDS_tshark = "wireshark"
|
RDEPENDS_tshark = "wireshark"
|
||||||
RDEPENDS_${PN}-gtk = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "${GTK}", "", d)} wireshark"
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|||||||
Reference in New Issue
Block a user