RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-02-02 21:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

this patch uses PKG_INSTALL:=1 and simplifies the Makefile, separates the menuconfig options in a separates Config.in file, adds a new patch to disable man pages (there was an error with QUILT=1 without this patch, as ln was used without -f), renames patches to be more explicit (and 1xx for Makefile patches and 2xx for source patches)

Browse Source 
-Raphael

SVN-Revision: 19997
This commit is contained in:
Travis Kemen 2010-03-05 20:24:13 +00:00
parent e09067b221
commit fab2cb71e1
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
package/libpcap/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libpcap PKG_NAME:=libpcap
PKG_VERSION:=1.0.0 PKG_VERSION:=1.0.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tcpdump.org/release/ PKG_SOURCE_URL:=http://www.tcpdump.org/release/
PKG_MD5SUM:=9ad1358c5dec48456405eac197a46d3d PKG_MD5SUM:=9ad1358c5dec48456405eac197a46d3d
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
@ -26,28 +28,17 @@ define Package/libpcap
endef endef
define Package/libpcap/description define Package/libpcap/description
This package contains a system-independent library for user-level network This package contains a system-independent library for user-level network packet
packet capture. capture.
endef endef
define Package/libpcap/config define Package/libpcap/config
config PCAP_HAS_USB source "$(SOURCE)/Config.in"
bool "Include USB support"
depends PACKAGE_libpcap
depends PACKAGE_kmod-usb-core
default n
config PCAP_HAS_BT
bool "Include bluetooth support"
depends PACKAGE_libpcap
depends PACKAGE_kmod-bluetooth
depends BROKEN
default n
endef endef
TARGET_CFLAGS += \ TARGET_CFLAGS += \
-ffunction-sections -fdata-sections -ffunction-sections \
-fdata-sections
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ac_cv_linux_vers=$(LINUX_VERSION) ac_cv_linux_vers=$(LINUX_VERSION)
@ -62,31 +53,28 @@ CONFIGURE_ARGS += \
--without-septel \ --without-septel \
--without-dag --without-dag
define Build/Compile MAKE_FLAGS += \
rm -rf $(PKG_INSTALL_DIR) CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include"
define Build/Configure
$(call Build/Configure/Default)
$(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h) $(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h)
$(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile) $(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
$(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h) $(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h)
$(if $(CONFIG_PCAP_HAS_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile) $(if $(CONFIG_PCAP_HAS_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
$(MAKE) -C $(PKG_BUILD_DIR) \
CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/include
$(CP) \ $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(1)/usr/include/
$(PKG_INSTALL_DIR)/usr/include/pcap* \
$(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib
$(CP) \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(1)/usr/lib/
$(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \
$(1)/usr/lib/
endef endef
define Package/libpcap/install define Package/libpcap/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libpcap)) $(eval $(call BuildPackage,libpcap))