Skip to contentSkip to conversation

glib-networking: remove PACKAGECONFIG for gnutls

PATCH In review Andreas Müller 3 participants 4 messages Apr 1, 2019 – Apr 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 glib-networking: remove PACKAGECONFIG for gnutls

* with patch suggested in [1] build complains with:
| ERROR: glib-networking-2.58.0-r0 do_configure: QA Issue: glib-networking: configure was passed unrecognised options: gnutls [unknown-configure-option]
* it turned mandatory - see meson.build:
| # *** Checks for GnuTLS ***
| gnutls_dep = dependency('gnutls', version: '>= 3.4.4', required: true)

[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-April/280693.html

---
 meta/recipes-core/glib-networking/glib-networking_2.58.0.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb +1 -4
index f3190e1cae0..a4138d67cc6 100644
@@ -7,14 +7,11 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SECTION = "libs"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 gnutls"
 
 SRC_URI[archive.md5sum] = "75b14b7e73a67753be9ce307751c661d"
 SRC_URI[archive.sha256sum] = "bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"
 
-PACKAGECONFIG ??= "gnutls"
-
-PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
 PACKAGECONFIG[libproxy] = "-Dlibproxy_support=true,-Dlibproxy_support=false,libproxy"
 
 EXTRA_OEMESON = "-Dgnome_proxy_support=false"
Signature · 1 line
2.20.1
#1 lore raw

This option was re-instated in 2.60, can you add a comment to the recipe please? So that when it’s upgraded, gnutls is again optional.

Alex

Quoted 43 lines · Andreas Müller

* with patch suggested in [1] build complains with:
| ERROR: glib-networking-2.58.0-r0 do_configure: QA Issue: glib-networking: configure was passed unrecognised options: gnutls [unknown-configure-option]
* it turned mandatory - see meson.build:
| # *** Checks for GnuTLS ***
| gnutls_dep = dependency('gnutls', version: '>= 3.4.4', required: true)

[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-April/280693.html

---
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb | 5 +----

1 file changed, 1 insertion(+), 4 deletions(-)
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb +0 -0
index f3190e1cae0..a4138d67cc6 100644
@@ -7,14 +7,11 @@ LICENSE = "LGPLv2.1"

LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"

SECTION = "libs"

meta/recipes-core/glib-networking/glib-networking_2.58.0.bb +1 -1
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 gnutls"

SRC_URI[archive.md5sum] = "75b14b7e73a67753be9ce307751c661d" SRC_URI[archive.sha256sum] = "bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"

meta/recipes-core/glib-networking/glib-networking_2.58.0.bb +0 -3
-PACKAGECONFIG ??= "gnutls"
-
-PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"

PACKAGECONFIG[libproxy] = "-Dlibproxy_support=true,-Dlibproxy_support=false,libproxy"

EXTRA_OEMESON = "-Dgnome_proxy_support=false"

Signature · 7 lines
2.20.1

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
#2 lore raw
Quoted 5 lines · Alexander Kanavin

This option was re-instated in 2.60, can you add a comment to the recipe please? So that when it’s upgraded, gnutls is again optional.

Alex

Since I don't see that meson configuration warnings make it into
warrier: Wouldn't it be better to update the glib recipes to 2.60 on master to avoid back and forth?

Andreas

#3 lore raw
Quoted 3 lines · Andreas Müller

Since I don't see that meson configuration warnings make it into
warrier: Wouldn't it be better to update the glib recipes to 2.60 on master to avoid back and forth?

Seems sensible.

Ross