projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix 'Preparing...' message for V=5 compile
[openwrt.git]
/
openwrt
/
package
/
tcpdump
/
Makefile
diff --git
a/openwrt/package/tcpdump/Makefile
b/openwrt/package/tcpdump/Makefile
index
2b854c8
..
fabd150
100644
(file)
--- a/
openwrt/package/tcpdump/Makefile
+++ b/
openwrt/package/tcpdump/Makefile
@@
-7,34
+7,28
@@
PKG_VERSION:=3.8.3
PKG_RELEASE:=1
PKG_MD5SUM:=30645001f4b97019677cad88d3811904
PKG_RELEASE:=1
PKG_MD5SUM:=30645001f4b97019677cad88d3811904
-PKG_SOURCE_URL:= \
- http://www.tcpdump.org/release \
- http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
+ http://ftp.gwdg.de/pub/misc/tcpdump/ \
+ http://www.at.tcpdump.org/ \
+ http://www.br.tcpdump.org/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-IPKG_TCPDUMP:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_TCPDUMP:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_TCPDUMP:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
-$(DL_DIR)/$(PKG_SOURCE):
- $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,TCPDUMP,tcpdump,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
- mkdir -p $(BUILD_DIR)/$(PKG_NAME)
- $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR)/$(PKG_NAME) $(TAR_OPTIONS) -
- touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
- (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured:
+ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
- ac_cv_linux_vers=
$(LINUX_VERSION)
\
+ ac_cv_linux_vers=
2
\
td_cv_buggygetaddrinfo="no" \
./configure \
--target=$(GNU_TARGET_NAME) \
td_cv_buggygetaddrinfo="no" \
./configure \
--target=$(GNU_TARGET_NAME) \
@@
-61,27
+55,19
@@
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
--enable-ipv6 \
--without-crypto \
);
--enable-ipv6 \
--without-crypto \
);
- touch $
(PKG_BUILD_DIR)/.configured
+ touch $
@
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
+ rm -rf $(PKG_INSTALL_DIR)
+ mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
$(MAKE) -C $(PKG_BUILD_DIR) \
- CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include"
+ CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all install
+ touch $@
-$(IPKG_TCPDUMP): $(PKG_BUILD_DIR)/$(PKG_NAME)
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_TCPDUMP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(IDIR_TCPDUMP)/usr/sbin
- cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_TCPDUMP)/usr/sbin/
- $(STRIP) $(IDIR_TCPDUMP)/usr/sbin/*
- mkdir -p $(PACKAGE_DIR)
+$(IPKG_TCPDUMP):
+ install -m0755 -d $(IDIR_TCPDUMP)/usr/sbin
+ install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(IDIR_TCPDUMP)/usr/sbin/
+ $(RSTRIP) $(IDIR_TCPDUMP)
$(IPKG_BUILD) $(IDIR_TCPDUMP) $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_TCPDUMP) $(PACKAGE_DIR)
-
-$(INFO_TCPDUMP): $(IPKG_TCPDUMP)
- $(IPKG) install $(IPKG_TCPDUMP)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_TCPDUMP)
-install: $(INFO_TCPDUMP)
-
-clean:
- rm -rf $(PKG_BUILD_DIR) $(IPKG_TCPDUMP)
This page took
0.028242 seconds
and
4
git commands to generate.