jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

sngrep: fix error if gnutls and openssl are both enabled

Browse Source 
gnutls and openssl support can't be enabled at the same time in
sngrep. Prefer openssl if available, otherwise use gnutls.

Fixes:

  http://autobuild.buildroot.net/results/7c775b1faf7be90fb4acd3653600f7b6b48aa86f/

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
[Thomas:
 - regroup CONF_OPTS lines
 - add an 'else' clause to explicitly disable gnutls and openssl when
   none are available
 - add a reference to the autobuilder failure]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Adam Duskett 2017-01-26 16:39:31 -05:00 committed by Thomas Petazzoni
parent b1039e7930
commit a5391ca453
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/sngrep/sngrep.mk
View File

@ -14,18 +14,15 @@ SNGREP_DEPENDENCIES = libpcap ncurses
# our ncurses wchar support is not properly detected # our ncurses wchar support is not properly detected
SNGREP_CONF_OPTS += --disable-unicode SNGREP_CONF_OPTS += --disable-unicode
ifeq ($(BR2_PACKAGE_GNUTLS),y) # openssl and gnutls can't be enabled at the same time.
SNGREP_DEPENDENCIES += gnutls
SNGREP_CONF_OPTS += --with-gnutls
else
SNGREP_CONF_OPTS += --without-gnutls
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
SNGREP_DEPENDENCIES += openssl SNGREP_DEPENDENCIES += openssl
SNGREP_CONF_OPTS += --with-openssl SNGREP_CONF_OPTS += --with-openssl --without-gnutls
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
SNGREP_DEPENDENCIES += gnutls
SNGREP_CONF_OPTS += --with-gnutls --without-openssl
else else
SNGREP_CONF_OPTS += --without-openssl SNGREP_CONF_OPTS += --without-gnutls --without-openssl
endif endif
ifeq ($(BR2_PACKAGE_PCRE),y) ifeq ($(BR2_PACKAGE_PCRE),y)