Hi again,
this patch fixes tcpdump parallel build.
-Raphael
diff -pruN tcpdump.orig/Makefile tcpdump/Makefile
--- tcpdump.orig/Makefile 2010-02-08 17:24:06.778911003 +0100
+++ tcpdump/Makefile 2010-02-08 17:24:35.694573060 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tcpdump
PKG_VERSION:=4.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
@@ -20,6 +20,8 @@ PKG_MD5SUM:=b22ca72890df2301d922c9f2d178
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/tcpdump/default
@@ -48,22 +50,15 @@ CONFIGURE_VARS += \
HOSTCC="$(HOSTCC)" \
td_cv_buggygetaddrinfo="no"
+MAKE_FLAGS := \
+ CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)"
+
ifeq ($(BUILD_VARIANT),mini)
TARGET_CFLAGS += -DTCPDUMP_MINI
CONFIGURE_ARGS += --disable-smb
- MAKE_FLAGS := TCPDUMP_MINI=1
-else
- MAKE_FLAGS :=
+ MAKE_FLAGS += TCPDUMP_MINI=1
endif
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- $(MAKE_FLAGS) \
- all install
-endef
-
define Package/tcpdump/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
