NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/systemd: fix build with openssl and gnutls

Browse Source 
Combination of cryptolib=openssl and dns-over-tls=gnutls is disallowed
since version 250 and
e37ad765c8
resulting in the following build failure since commit
e9fb26cbb8:

../output-1/build/systemd-250/meson.build:1482:16: ERROR: Problem encountered: Sorry, -Ddns-over-tls=gnutls is not supported when openssl is used as the cryptolib

Fixes:
 - http://autobuild.buildroot.org/results/2fcd4ad64b32cc4835866c9d99e05ab8c9bc794a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2021-12-30 10:44:43 +01:00 committed by Thomas Petazzoni
parent 6969ec0f74
commit de562463b0
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/systemd/systemd.mk
View File

@ -115,13 +115,6 @@ else
SYSTEMD_CONF_OPTS += -Delfutils=false SYSTEMD_CONF_OPTS += -Delfutils=false
endif endif
ifeq ($(BR2_PACKAGE_GNUTLS),y)
SYSTEMD_DEPENDENCIES += gnutls
SYSTEMD_CONF_OPTS += -Dgnutls=true
else
SYSTEMD_CONF_OPTS += -Dgnutls=false
endif
ifeq ($(BR2_PACKAGE_IPTABLES),y) ifeq ($(BR2_PACKAGE_IPTABLES),y)
SYSTEMD_DEPENDENCIES += iptables SYSTEMD_DEPENDENCIES += iptables
SYSTEMD_CONF_OPTS += -Dlibiptc=true SYSTEMD_CONF_OPTS += -Dlibiptc=true
@ -230,13 +223,6 @@ else
SYSTEMD_CONF_OPTS += -Dp11kit=false SYSTEMD_CONF_OPTS += -Dp11kit=false
endif endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SYSTEMD_DEPENDENCIES += openssl
SYSTEMD_CONF_OPTS += -Dopenssl=true
else
SYSTEMD_CONF_OPTS += -Dopenssl=false
endif
ifeq ($(BR2_PACKAGE_PCRE2),y) ifeq ($(BR2_PACKAGE_PCRE2),y)
SYSTEMD_DEPENDENCIES += pcre2 SYSTEMD_DEPENDENCIES += pcre2
SYSTEMD_CONF_OPTS += -Dpcre2=true SYSTEMD_CONF_OPTS += -Dpcre2=true
@ -491,14 +477,26 @@ else
SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false
endif endif
ifeq ($(BR2_PACKAGE_GNUTLS),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
SYSTEMD_CONF_OPTS += -Ddns-over-tls=gnutls -Ddefault-dns-over-tls=opportunistic SYSTEMD_CONF_OPTS += \
SYSTEMD_DEPENDENCIES += gnutls -Dgnutls=false \
else ifeq ($(BR2_PACKAGE_OPENSSL),y) -Dopenssl=true \
SYSTEMD_CONF_OPTS += -Ddns-over-tls=openssl -Ddefault-dns-over-tls=opportunistic -Ddns-over-tls=openssl \
-Ddefault-dns-over-tls=opportunistic
SYSTEMD_DEPENDENCIES += openssl SYSTEMD_DEPENDENCIES += openssl
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
SYSTEMD_CONF_OPTS += \
-Dgnutls=true \
-Dopenssl=false \
-Ddns-over-tls=gnutls \
-Ddefault-dns-over-tls=opportunistic
SYSTEMD_DEPENDENCIES += gnutls
else else
SYSTEMD_CONF_OPTS += -Ddns-over-tls=false -Ddefault-dns-over-tls=no SYSTEMD_CONF_OPTS += \
-Dgnutls=false \
-Dopenssl=false \
-Ddns-over-tls=false \
-Ddefault-dns-over-tls=no
endif endif
ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)