| Message ID | 0e28bc4a3824cba288c9930f98653f60f1d0e093.1471791997.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Sun, 21 Aug 2016 18:06:38 +0300, Baruch Siach wrote: > The wireshark autoconf acinclude.m4 source calls AC_PATH_TOOL() to find > pcap-config only when --with-pcap is missing. Otherwise it just trusts the > PCAP_CONFIG environment variable. Since we use --with-pcap, seeding > ac_cv_path_PCAP_CONFIG gives nothing. Set PCAP_CONFIG instead to let the > configure script discover the dependencies of libpcap. This fixes static build > when libpcap links with libusb. > > Fixes: > http://autobuild.buildroot.net/results/ef5/ef50939b89373aad04275cbdeeff4c0e2807c0d5/ > http://autobuild.buildroot.net/results/ffc/ffc921135c16c7017cd7a23c5e0c445757509abc/ > http://autobuild.buildroot.net/results/2d8/2d8cd47cc664dff0f76a230b36c37291f3087e35/ > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > package/wireshark/wireshark.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 12060e2edd2e..42a5e74bc603 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -11,7 +11,7 @@ WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2 WIRESHARK_CONF_ENV = \ - ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config + PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config # patch touching configure.ac WIRESHARK_AUTORECONF = YES
The wireshark autoconf acinclude.m4 source calls AC_PATH_TOOL() to find pcap-config only when --with-pcap is missing. Otherwise it just trusts the PCAP_CONFIG environment variable. Since we use --with-pcap, seeding ac_cv_path_PCAP_CONFIG gives nothing. Set PCAP_CONFIG instead to let the configure script discover the dependencies of libpcap. This fixes static build when libpcap links with libusb. Fixes: http://autobuild.buildroot.net/results/ef5/ef50939b89373aad04275cbdeeff4c0e2807c0d5/ http://autobuild.buildroot.net/results/ffc/ffc921135c16c7017cd7a23c5e0c445757509abc/ http://autobuild.buildroot.net/results/2d8/2d8cd47cc664dff0f76a230b36c37291f3087e35/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)