[Buildroot] [git commit] package/sslh: add optional pcre dependency
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Thu Apr 11 13:01:47 UTC 2019
commit: https://git.buildroot.net/buildroot/commit/?id=69f87de71dc9c4fc838145fdfc65dd3052a422e4
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
pcre dependency has been added in version 1.18 and
https://github.com/yrutschle/sslh/commit/ab3324be477b2663196e0cc73d96aa38d59da65a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/sslh/sslh.mk | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
index 3a9223b23a..5c868dfe2f 100644
--- a/package/sslh/sslh.mk
+++ b/package/sslh/sslh.mk
@@ -11,12 +11,22 @@ SSLH_LICENSE_FILES = COPYING
SSLH_DEPENDENCIES = libconfig
+SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
+
+ifeq ($(BR2_PACKAGE_PCRE),y)
+SSLH_DEPENDENCIES += pcre
+SSLH_MAKE_OPTS += USELIBPCRE=1
+else
+SSLH_MAKE_OPTS += USELIBPCRE=
+endif
+
define SSLH_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+ $(TARGET_MAKE_ENV) $(MAKE1) $(SSLH_MAKE_OPTS) -C $(@D)
endef
define SSLH_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+ $(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D) \
+ DESTDIR=$(TARGET_DIR) install
endef
define SSLH_INSTALL_INIT_SYSV
More information about the buildroot
mailing list