* [Buildroot] [pull request] Pull request for branch fix-ac-cv-linux-vers
@ 2011-01-25 8:46 Thomas Petazzoni
2011-01-25 8:46 ` [Buildroot] [PATCH 1/1] tcpdump, libpcap: simplify and fix ac_cv_linux_vers Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2011-01-25 8:46 UTC (permalink / raw)
To: buildroot
The following changes since commit 87cb38b9286f1eca230e77715d7d8fca8289358e:
Peter Korsgaard (1):
busybox: 1.18.2 fix for wc
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot fix-ac-cv-linux-vers
Thomas Petazzoni (1):
tcpdump, libpcap: simplify and fix ac_cv_linux_vers
package/libpcap/libpcap.mk | 2 +-
package/tcpdump/tcpdump.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] tcpdump, libpcap: simplify and fix ac_cv_linux_vers
2011-01-25 8:46 [Buildroot] [pull request] Pull request for branch fix-ac-cv-linux-vers Thomas Petazzoni
@ 2011-01-25 8:46 ` Thomas Petazzoni
2011-01-25 15:23 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2011-01-25 8:46 UTC (permalink / raw)
To: buildroot
For some reason, tcpdump and libpcap need to have some information
about the kernel version being used. This information is passed using
the ac_cv_linux_vers autoconf variable.
However, the current value is determined using
BR2_DEFAULT_KERNEL_HEADERS which is only defined when an internal
Buildroot toolchain is used. So it would break with an external
toolchain or the Crosstool-NG backend.
According to Mike Frysinger at
http://lists.busybox.net/pipermail/buildroot/2011-January/040861.html,
this value is only used to determine if the kernel version is 0.x, 1.x
or 2.x, so passing ac_cv_linux_vers=2 is sufficient since Buildroot
only supports the 2.6 kernel anyway.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libpcap/libpcap.mk | 2 +-
package/tcpdump/tcpdump.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index eebfc03..a2d0376 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -14,7 +14,7 @@ LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
LIBPCAP_DEPENDENCIES:=zlib
-LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) \
+LIBPCAP_CONF_ENV:=ac_cv_linux_vers=2 \
ac_cv_header_linux_wireless_h=yes # configure misdetects this
LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 8122816..720a29a 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -9,7 +9,7 @@
TCPDUMP_VERSION:=4.1.1
TCPDUMP_SITE:=http://www.tcpdump.org/release
TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz
-TCPDUMP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS)))))
+TCPDUMP_CONF_ENV:=ac_cv_linux_vers=2
TCPDUMP_CONF_OPT:=--without-crypto \
$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
TCPDUMP_DEPENDENCIES:=zlib libpcap
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] tcpdump, libpcap: simplify and fix ac_cv_linux_vers
2011-01-25 8:46 ` [Buildroot] [PATCH 1/1] tcpdump, libpcap: simplify and fix ac_cv_linux_vers Thomas Petazzoni
@ 2011-01-25 15:23 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2011-01-25 15:23 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> For some reason, tcpdump and libpcap need to have some information
Thomas> about the kernel version being used. This information is passed using
Thomas> the ac_cv_linux_vers autoconf variable.
Thomas> However, the current value is determined using
Thomas> BR2_DEFAULT_KERNEL_HEADERS which is only defined when an internal
Thomas> Buildroot toolchain is used. So it would break with an external
Thomas> toolchain or the Crosstool-NG backend.
Thomas> According to Mike Frysinger at
Thomas> http://lists.busybox.net/pipermail/buildroot/2011-January/040861.html,
Thomas> this value is only used to determine if the kernel version is 0.x, 1.x
Thomas> or 2.x, so passing ac_cv_linux_vers=2 is sufficient since Buildroot
Thomas> only supports the 2.6 kernel anyway.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-25 15:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-25 8:46 [Buildroot] [pull request] Pull request for branch fix-ac-cv-linux-vers Thomas Petazzoni
2011-01-25 8:46 ` [Buildroot] [PATCH 1/1] tcpdump, libpcap: simplify and fix ac_cv_linux_vers Thomas Petazzoni
2011-01-25 15:23 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.