cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

libdaq,snort: install/use libdaq2 in its own dir

Browse Source 
If used with default paths, libdaq 2.x and libdaq 3.x will overwrite
some of the other version's files.  Install them in different places to
avoid trouble.

Snort is the only package that uses libdaq, so update it at the same
time to avoid creating a failing commit.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit 48e2b6ebb3)
This commit is contained in:
Eneas U de Queiroz
2021-01-19 22:06:34 -03:00
committed by Josef Schlehofer
parent 7852ef7ccb
commit 6b05c7ae76
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libdaq/Makefile
+7 -7
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libdaq PKG_NAME:=libdaq
PKG_VERSION:=2.2.2 PKG_VERSION:=2.2.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/ PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz
@@ -45,12 +45,12 @@ CONFIGURE_ARGS+= \
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/usr/include $(INSTALL_DIR) $(STAGING_DIR)/usr/include/daq2
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/daq2/
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/daq2/
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2/daq
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq2/daq/
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin $(INSTALL_DIR) $(STAGING_DIR)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/
$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/daq-modules-config $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/daq-modules-config
net/snort/Makefile
+3 -3
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=snort PKG_NAME:=snort
PKG_VERSION:=2.9.17 PKG_VERSION:=2.9.17
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -58,8 +58,8 @@ CONFIGURE_ARGS += \
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
--with-libpcre-includes="$(STAGING_DIR)/usr/include" \ --with-libpcre-includes="$(STAGING_DIR)/usr/include" \
--with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \
--with-daq-includes="$(STAGING_DIR)/usr/include" \ --with-daq-includes="$(STAGING_DIR)/usr/include/daq2" \
--with-daq-libraries="$(STAGING_DIR)/usr/lib" \ --with-daq-libraries="$(STAGING_DIR)/usr/lib/daq2" \
--disable-static-daq --disable-static-daq
ifeq ($(CONFIG_SNORT_LZMA),) ifeq ($(CONFIG_SNORT_LZMA),)