jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

grep: standardise pcre optional dependency

Browse Source 
Add the 'disable' config option in the 'else' clause of the optional
dependency as is the common pattern.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Baruch Siach 2017-07-24 06:59:53 +03:00 committed by Thomas Petazzoni
parent d26c64809d
commit 0e27dda195
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/grep/grep.mk
View File

@ -9,8 +9,7 @@ GREP_SITE = $(BR2_GNU_MIRROR)/grep
GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
GREP_LICENSE = GPL-3.0+ GREP_LICENSE = GPL-3.0+
GREP_LICENSE_FILES = COPYING GREP_LICENSE_FILES = COPYING
GREP_CONF_OPTS = --disable-perl-regexp \ GREP_CONF_OPTS = $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
# link with iconv if enabled # link with iconv if enabled
@ -23,6 +22,8 @@ endif
ifeq ($(BR2_PACKAGE_PCRE),y) ifeq ($(BR2_PACKAGE_PCRE),y)
GREP_CONF_OPTS += --enable-perl-regexp GREP_CONF_OPTS += --enable-perl-regexp
GREP_DEPENDENCIES += pcre GREP_DEPENDENCIES += pcre
else
GREP_CONF_OPTS += --disable-perl-regexp
endif endif
# Full grep preferred over busybox grep # Full grep preferred over busybox grep