Skip to content

Commit 00450d3

Browse files
committed
vectorscan: remove vectorscan-headers package and add ABI version
The vectorscan-headers package installed headers to the target device, but headers are only needed during the build process (via Build/InstallDev). - Rename vectorscan-runtime to vectorscan to simplify things - Add ABI_VERSION:=5 to track library soname versioning Signed-off-by: Josef Schlehofer <[email protected]> (cherry picked from commit 8a3c7a6)
1 parent 505e8e1 commit 00450d3

File tree

1 file changed

+10
-27
lines changed

1 file changed

+10
-27
lines changed

libs/vectorscan/Makefile

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=vectorscan
99
PKG_VERSION:=5.4.12
10-
PKG_RELEASE:=1
10+
PKG_RELEASE:=2
1111

1212
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1313
PKG_SOURCE_URL:=https://codeload.github.com/VectorCamp/vectorscan/tar.gz/$(PKG_NAME)/$(PKG_VERSION)?
@@ -41,30 +41,19 @@ else
4141
CMAKE_OPTIONS += -DFAT_RUNTIME=OFF -DBUILD_BENCHMARKS=OFF
4242
endif
4343

44-
define Package/vectorscan-headers
45-
CATEGORY:=Libraries
44+
define Package/vectorscan
4645
SECTION:=libs
47-
TITLE:=Vectorscan Headers
48-
URL:=https://github.com/VectorCamp/vectorscan
49-
DEPENDS:=@(x86_64||aarch64)
50-
endef
51-
52-
define Package/vectorscan-runtime
5346
CATEGORY:=Libraries
54-
SECTION:=libs
5547
TITLE:=Vectorscan Runtime
5648
URL:=https://github.com/VectorCamp/vectorscan
5749
DEPENDS:= +libstdcpp +libsqlite3 @(x86_64||aarch64)
50+
ABI_VERSION:=5
5851
endef
5952

60-
define Package/vectorscan-headers/description
61-
This package contains the headers for Vectorscan.
62-
A fork of Intel's Hyperscan, modified to run on more platforms.
63-
endef
64-
65-
define Package/vectorscan-runtime/description
66-
This package contains the shared objects for Vectorscan.
67-
A fork of Intel's Hyperscan, modified to run on more platforms.
53+
define Package/vectorscan/description
54+
Vectorscan is a portable fork of Intel's Hyperscan, a high-performance
55+
multiple regex matching library. It provides a streaming and block-based
56+
regex matcher with support for large pattern sets.
6857
endef
6958

7059
define Build/InstallDev
@@ -76,15 +65,9 @@ define Build/InstallDev
7665
$(INSTALL_DATA) $(PKG_BUILD_DIR)/libhs.pc $(1)/usr/lib/pkgconfig/libhs.pc
7766
endef
7867

79-
define Package/vectorscan-headers/install
80-
$(INSTALL_DIR) $(1)/usr/include/hs
81-
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/hs/*.h $(1)/usr/include/hs/
82-
endef
83-
84-
define Package/vectorscan-runtime/install
68+
define Package/vectorscan/install
8569
$(INSTALL_DIR) $(1)/usr/lib
86-
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhs* $(1)/usr/lib/
70+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhs.so* $(1)/usr/lib/
8771
endef
8872

89-
$(eval $(call BuildPackage,vectorscan-headers))
90-
$(eval $(call BuildPackage,vectorscan-runtime))
73+
$(eval $(call BuildPackage,vectorscan))

0 commit comments

Comments
 (0)