summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-networking
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-08 16:17:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 15:55:32 (GMT)
commit3d15fdcd2d1900d18b1e6a23619e8c072390e33d (patch)
tree2be19303f7fb9a93d9afb77addff3a43280f4f29 /meta/recipes-core/glib-networking
parentb740c9275e33ee53b9a530aa7321ddacef58dba5 (diff)
downloadpoky-3d15fdcd2d1900d18b1e6a23619e8c072390e33d.tar.gz
glib-networking: upgrade to 2.38.0 and PACKAGECONFIGise
Use PACKAGECONFIG to add options for ca-certificates, gnutls, and libproxy. Enable ca-certificates by default as all it needs to know is the right path, ca-certificates not being installed isn't fatal. (From OE-Core rev: 1f03b6aa9e475f341815788613513ff63add8a5f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-networking')
-rw-r--r--meta/recipes-core/glib-networking/glib-networking_2.38.0.bb (renamed from meta/recipes-core/glib-networking/glib-networking_2.36.2.bb)19
1 files changed, 12 insertions, 7 deletions
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
index 5200b94..ad9ad64 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
@@ -6,19 +6,24 @@ LICENSE = "LGPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 6LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
7 7
8SECTION = "libs" 8SECTION = "libs"
9DEPENDS = "glib-2.0 gnutls intltool-native" 9DEPENDS = "glib-2.0 intltool-native"
10 10
11SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz" 11GNOME_COMPRESS_TYPE = "xz"
12 12
13SRC_URI[md5sum] = "fb9121742ed36d1723f296eea19dbb3c" 13SRC_URI[archive.md5sum] = "a22907deed3d956860d83aa3233e86ff"
14SRC_URI[sha256sum] = "2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9" 14SRC_URI[archive.sha256sum] = "a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d"
15 15
16PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= "ca-certificates gnutls"
17
18# No explicit dependency as it works without ca-certificates installed
19PACKAGECONFIG[ca-certificates] = "--with-ca-certificates=${sysconfdir}/ssl/certs/ca-certificates.crt,--without-ca-certificates"
20PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
21PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
17PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit" 22PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit"
18 23
19EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy" 24EXTRA_OECONF = "--without-gnome-proxy"
20 25
21inherit autotools pkgconfig 26inherit gnomebase
22 27
23FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/" 28FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
24FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/" 29FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"