Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libndpi: update to 2.8.0

Browse source 
The nDPI autogen.sh is broken and can lead to compile issues. Fixed.
Also removed PKG_INSTALL since it produces invalid symlinks to *.so*.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig 2019-05-02 23:44:19 +02:00
parent 420396fba7
commit ac2c99ea5c
No known key found for this signature in database
GPG key ID: 22C5333D922537D2
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libs/libndpi/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libndpi PKG_NAME:=libndpi
PKG_VERSION:=2.6 PKG_VERSION:=2.8
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ntop/nDPI/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/ntop/nDPI/tar.gz/$(PKG_VERSION)?
PKG_HASH:=efdfb68940385b18079920330528978765dc2a90c8163d10f63301bddadbf91e PKG_HASH:=f98def4d0e43818317b20e2887ce500b2d6a5a9c8ddb28cf57ae51caae0f33cc
PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION)
PKG_MAINTAINER:=Banglang Huang <banglang.huang@foxmail.com> PKG_MAINTAINER:=Banglang Huang <banglang.huang@foxmail.com>
@ -21,9 +21,9 @@ PKG_LICENSE:=LGPLv3
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=autogen.sh
PKG_BUILD_DEPENDS:=libpcap PKG_BUILD_DEPENDS:=libpcap
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -41,36 +41,37 @@ define Package/libndpi/description
Based on OpenDPI it includes ntop extensions. Based on OpenDPI it includes ntop extensions.
endef endef
define Build/Configure define Build/Prepare
( cd $(PKG_BUILD_DIR); ./autogen.sh ) $(PKG_UNPACK)
$(call Build/Configure/Default) $(Build/Patch)
mv $(PKG_BUILD_DIR)/configure.seed $(PKG_BUILD_DIR)/configure.ac
$(SED) "s/@NDPI_MAJOR@/2/g" \
-e "s/@NDPI_MINOR@/8/g" \
-e "s/@NDPI_PATCH@/0/g" \
-e "s/@NDPI_VERSION_SHORT@/2.8.0/g" \
$(PKG_BUILD_DIR)/configure.ac
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/include/ndpi
$(CP) \ $(CP) $(PKG_BUILD_DIR)/src/include/*.h \
$(PKG_INSTALL_DIR)/usr/local/include/ndpi \ $(1)/usr/include/ndpi/
$(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) \ $(CP) $(PKG_BUILD_DIR)/src/lib/libndpi.so* \
$(PKG_INSTALL_DIR)/usr/local/lib/libndpi.so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) \ $(CP) $(PKG_BUILD_DIR)/libndpi.pc \
$(PKG_INSTALL_DIR)/usr/libdata/pkgconfig/libndpi.pc \
$(1)/usr/lib/pkgconfig/ $(1)/usr/lib/pkgconfig/
endef endef
define Package/libndpi/install define Package/libndpi/install
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/
$(CP) \ $(CP) $(PKG_BUILD_DIR)/src/lib/libndpi.so* \
$(PKG_INSTALL_DIR)/usr/local/lib/libndpi.so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/bin/
$(CP) \ $(CP) $(PKG_BUILD_DIR)/example/ndpiReader \
$(PKG_INSTALL_DIR)/usr/local/bin/ndpiReader \
$(1)/usr/bin/ $(1)/usr/bin/
endef endef