diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-10-08 17:17:54 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:55:32 +0100 |
| commit | 3d15fdcd2d1900d18b1e6a23619e8c072390e33d (patch) | |
| tree | 2be19303f7fb9a93d9afb77addff3a43280f4f29 /meta/recipes-core | |
| parent | b740c9275e33ee53b9a530aa7321ddacef58dba5 (diff) | |
| download | poky-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')
| -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 5200b94ad9..ad9ad64f8a 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" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
| 7 | 7 | ||
| 8 | SECTION = "libs" | 8 | SECTION = "libs" |
| 9 | DEPENDS = "glib-2.0 gnutls intltool-native" | 9 | DEPENDS = "glib-2.0 intltool-native" |
| 10 | 10 | ||
| 11 | SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz" | 11 | GNOME_COMPRESS_TYPE = "xz" |
| 12 | 12 | ||
| 13 | SRC_URI[md5sum] = "fb9121742ed36d1723f296eea19dbb3c" | 13 | SRC_URI[archive.md5sum] = "a22907deed3d956860d83aa3233e86ff" |
| 14 | SRC_URI[sha256sum] = "2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9" | 14 | SRC_URI[archive.sha256sum] = "a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d" |
| 15 | 15 | ||
| 16 | PACKAGECONFIG ??= "" | 16 | PACKAGECONFIG ??= "ca-certificates gnutls" |
| 17 | |||
| 18 | # No explicit dependency as it works without ca-certificates installed | ||
| 19 | PACKAGECONFIG[ca-certificates] = "--with-ca-certificates=${sysconfdir}/ssl/certs/ca-certificates.crt,--without-ca-certificates" | ||
| 20 | PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" | ||
| 21 | PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" | ||
| 17 | PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit" | 22 | PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit" |
| 18 | 23 | ||
| 19 | EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy" | 24 | EXTRA_OECONF = "--without-gnome-proxy" |
| 20 | 25 | ||
| 21 | inherit autotools pkgconfig | 26 | inherit gnomebase |
| 22 | 27 | ||
| 23 | FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/" | 28 | FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/" |
| 24 | FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/" | 29 | FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/" |