diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-08-25 18:07:37 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-09 12:12:23 +0100 |
commit | b41127f50366289713cf505834e0b0af726954af (patch) | |
tree | 35d4d4370806c285c4e4afd38af8b6ef578fe4c7 /meta/recipes-support/gnutls | |
parent | 3bea0e52fd8449c016ca306a5ce255ec2a3347d5 (diff) | |
download | poky-b41127f50366289713cf505834e0b0af726954af.tar.gz |
gnutls: enable gtk-doc
gtk-doc also requires --enable-doc, so that is no longer configurable.
(From OE-Core rev: 32dd42e8930bf38abf280e04b4ee22c9a9a2fae9)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 0ac7c3720a..51b9d2b191 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
@@ -19,11 +19,10 @@ SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split | |||
19 | 19 | ||
20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" | 20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" |
21 | 21 | ||
22 | inherit autotools texinfo binconfig pkgconfig gettext lib_package | 22 | inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc |
23 | 23 | ||
24 | PACKAGECONFIG ??= "libidn zlib" | 24 | PACKAGECONFIG ??= "libidn zlib" |
25 | 25 | ||
26 | PACKAGECONFIG[docs] = "--enable-doc,--disable-doc" | ||
27 | PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" | 26 | PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" |
28 | PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" | 27 | PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" |
29 | PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" | 28 | PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" |
@@ -31,6 +30,7 @@ PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" | |||
31 | PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" | 30 | PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" |
32 | 31 | ||
33 | EXTRA_OECONF = " \ | 32 | EXTRA_OECONF = " \ |
33 | --enable-doc \ | ||
34 | --disable-libdane \ | 34 | --disable-libdane \ |
35 | --disable-guile \ | 35 | --disable-guile \ |
36 | --disable-rpath \ | 36 | --disable-rpath \ |