- update to libpcap-0.9.4 and tcpdump-3.9.4

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 6cb44e6d993ad65c44310bc01914f7409dade937..3f62363b567fd2c6e84c3a314aff46a6cea242c9 100644 (file)
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -21,7 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-LIBPCAP_VER:=0.9.3
+LIBPCAP_VER:=0.9.4
 LIBPCAP_DIR:=$(BUILD_DIR)/libpcap-$(LIBPCAP_VER)
 LIBPCAP_SITE:=http://www.tcpdump.org/release
 LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VER).tar.gz
@@ -41,14 +41,14 @@ $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
        ( \
                cd $(LIBPCAP_DIR) ; \
                ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
-               BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
+               BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
-               --with-build-cc=$(HOSTCC) \
+               --with-build-cc="$(HOSTCC)" \
                --disable-yydebug \
                --prefix=/usr \
                --with-pcap=linux \
@@ -57,6 +57,7 @@ $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
 
 $(LIBPCAP_DIR)/libpcap.a: $(LIBPCAP_DIR)/.configured
        $(MAKE) \
+               CC="$(TARGET_CC)" \
                AR="$(TARGET_CROSS)ar" \
                -C $(LIBPCAP_DIR)
 

diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk
index d5a95e8b9e89d02d9cee7867a44d5cb4917ee188..4f3627e4bff05ca4284419a17e1b810d8eb371bb 100644 (file)
--- a/package/tcpdump/dhcpdump.mk
+++ b/package/tcpdump/dhcpdump.mk
@@ -24,14 +24,14 @@ $(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE)
 $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
        ( \
                cd $(DHCPDUMP_DIR) ; \
-               BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
+               BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
-               --with-build-cc=$(HOSTCC) \
+               --with-build-cc="$(HOSTCC)" \
                --prefix=$(STAGING_DIR) \
                --libdir=$(STAGING_DIR)/lib \
                --includedir=$(STAGING_DIR)/include \
@@ -39,7 +39,7 @@ $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
        touch $(DHCPDUMP_DIR)/.configured
 
 $(DHCPDUMP_DIR)/dhcpdump: $(DHCPDUMP_DIR)/.configured
-       $(MAKE) -C $(DHCPDUMP_DIR)
+       $(MAKE) CC="$(TARGET_CC)" -C $(DHCPDUMP_DIR)
 
 $(TARGET_DIR)/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump
        cp -af $< $@

diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 20eff78804550eae5257c4e7aab98783017198ac..402c65d1681c1ef129336881b2e0de0e24f136ec 100644 (file)
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -6,7 +6,7 @@
 # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
 
-TCPDUMP_VER:=3.9.3
+TCPDUMP_VER:=3.9.4
 TCPDUMP_DIR:=$(BUILD_DIR)/tcpdump-$(TCPDUMP_VER)
 TCPDUMP_SITE:=http://www.tcpdump.org/release
 TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VER).tar.gz
@@ -25,14 +25,14 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
        ( \
                cd $(TCPDUMP_DIR) ; \
                ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
-               BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
+               BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
-               --with-build-cc=$(HOSTCC) \
+               --with-build-cc="$(HOSTCC)" \
                --prefix=$(STAGING_DIR) \
                --libdir=$(STAGING_DIR)/lib \
                --includedir=$(STAGING_DIR)/include \
@@ -43,6 +43,7 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
 
 $(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
        $(MAKE) \
+               CC="$(TARGET_CC)" \
                LDFLAGS="-L$(STAGING_DIR)/lib" \
                LIBS="-lpcap" \
                INCLS="-I. -I$(STAGING_DIR)/include" \