Skip to contentSkip to conversation

package/sslh: add optional pcre dependency

PATCH New Fabrice Fontaine 2 participants 3 messages Apr 5, 2019 – Apr 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/sslh: add optional pcre dependency

pcre dependency has been added in version 1.18 and
https://github.com/yrutschle/sslh/commit/ab3324be477b2663196e0cc73d96aa38d59da65a

---
 package/sslh/sslh.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
package/sslh/sslh.mk +12 -2
index 3a9223b23a..5c868dfe2f 100644
@@ -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
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/sslh: add optional libcap dependency

libcap dependency has been added in version 1.16 with
https://github.com/yrutschle/sslh/commit/009faa64b75801961f88ec5a7a09fd991168d4e9

---
 package/sslh/sslh.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/sslh/sslh.mk +7 -0
index 5c868dfe2f..e8eb5e2b6f 100644
@@ -13,6 +13,13 @@ SSLH_DEPENDENCIES = libconfig
 
 SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+SSLH_DEPENDENCIES += libcap
+SSLH_MAKE_OPTS += USELIBCAP=1
+else
+SSLH_MAKE_OPTS += USELIBCAP=
+endif
+
 ifeq ($(BR2_PACKAGE_PCRE),y)
 SSLH_DEPENDENCIES += pcre
 SSLH_MAKE_OPTS += USELIBPCRE=1
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 package/sslh: add optional pcre dependency

In reply to Fabrice Fontaine
Quoted 7 lines · On Fri, 5 Apr 2019 23:16:35 +0200 Fabrice Fontaine…

pcre dependency has been added in version 1.18 and
https://github.com/yrutschle/sslh/commit/ab3324be477b2663196e0cc73d96aa38d59da65a

---
 package/sslh/sslh.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Both applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com