summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-05-01 22:40:37 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-20 16:12:25 +0200
commit4ded5d6af4f0198036183f00de190569d7578bc3 (patch)
tree1b30341619d1cc1aaee1c8f3ff623d93ec6ffa96
parentaa406bb94bcf65846e2ba2a38a7480ac418e7183 (diff)
downloadbuildroot-4ded5d6af4f0198036183f00de190569d7578bc3.tar.gz
buildroot-4ded5d6af4f0198036183f00de190569d7578bc3.zip
systemd: add optional dependency on libidn2
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> [Thomas: simplify ifeq/else/endif sequence.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/systemd/systemd.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index db7fb43636..1e4b257731 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -75,11 +75,15 @@ else
SYSTEMD_CONF_OPTS += -Daudit=false
endif
-ifeq ($(BR2_PACKAGE_LIBIDN),y)
+# Both options can't be selected at the same time so prefer libidn2
+ifeq ($(BR2_PACKAGE_LIBIDN2),y)
+SYSTEMD_DEPENDENCIES += libidn2
+SYSTEMD_CONF_OPTS += -Dlibidn2=true -Dlibidn=false
+else ifeq ($(BR2_PACKAGE_LIBIDN),y)
SYSTEMD_DEPENDENCIES += libidn
-SYSTEMD_CONF_OPTS += -Dlibidn=true
+SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false
else
-SYSTEMD_CONF_OPTS += -Dlibidn=false
+SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true
endif
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
OpenPOWER on IntegriCloud