From 378228c1587e16880e564378a9533f614331648b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 11 Jan 2016 08:30:39 +0800 Subject: gnupg: 2.1.7 -> 2.1.10 Add PACKAGECONFIG for sqlite3 to avoid QA Warning ... WARNING: QA Issue: gnupg rdepends on libsqlite3, but it isn't a build dependency? [build-deps] ... Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- meta/recipes-support/gnupg/gnupg_2.1.10.bb | 45 ++++++++++++++++++++++++++++++ meta/recipes-support/gnupg/gnupg_2.1.7.bb | 42 ---------------------------- 2 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 meta/recipes-support/gnupg/gnupg_2.1.10.bb delete mode 100644 meta/recipes-support/gnupg/gnupg_2.1.7.bb (limited to 'meta/recipes-support/gnupg') diff --git a/meta/recipes-support/gnupg/gnupg_2.1.10.bb b/meta/recipes-support/gnupg/gnupg_2.1.10.bb new file mode 100644 index 0000000000..5a4f2e8fb5 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg_2.1.10.bb @@ -0,0 +1,45 @@ +SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" +HOMEPAGE = "http://www.gnupg.org/" +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" + +DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" + +inherit autotools gettext texinfo pkgconfig + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://pkgconfig.patch \ + file://use-pkgconfig-instead-of-npth-config.patch \ + file://dirmngr-uses-libgpg-error.patch \ + file://autogen.sh-fix-find-version-for-beta-checking.patch \ + " + +SRC_URI[md5sum] = "f0a7cb09fe119f8b82eba7efecd27dc0" +SRC_URI[sha256sum] = "93bd58d81771a4fa488566e5d2e13b1fd7afc86789401eb41731882abfd26cf9" + +EXTRA_OECONF = "--disable-ldap \ + --disable-ccid-driver \ + --with-zlib=${STAGING_LIBDIR}/.. \ + --with-bzip2=${STAGING_LIBDIR}/.. \ + --with-readline=${STAGING_LIBDIR}/.. \ + " +RRECOMMENDS_${PN} = "pinentry" + +do_configure_prepend () { + # Else these could be used in prefernce to those in aclocal-copy + rm -f ${S}/m4/gpg-error.m4 + rm -f ${S}/m4/libassuan.m4 + rm -f ${S}/m4/ksba.m4 + rm -f ${S}/m4/libgcrypt.m4 +} + +do_install_append() { + ln -sf gpg2 ${D}${bindir}/gpg + ln -sf gpgv2 ${D}${bindir}/gpgv +} + +RDEPENDS_${PN} = "gnutls" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" diff --git a/meta/recipes-support/gnupg/gnupg_2.1.7.bb b/meta/recipes-support/gnupg/gnupg_2.1.7.bb deleted file mode 100644 index 979e6f9b99..0000000000 --- a/meta/recipes-support/gnupg/gnupg_2.1.7.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" -HOMEPAGE = "http://www.gnupg.org/" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" - -DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" - -inherit autotools gettext texinfo pkgconfig - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://pkgconfig.patch \ - file://use-pkgconfig-instead-of-npth-config.patch \ - file://dirmngr-uses-libgpg-error.patch \ - file://autogen.sh-fix-find-version-for-beta-checking.patch \ - " - -SRC_URI[md5sum] = "ebdf92b15b8bcd8579b643c7f41a3238" -SRC_URI[sha256sum] = "c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e" - -EXTRA_OECONF = "--disable-ldap \ - --disable-ccid-driver \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-bzip2=${STAGING_LIBDIR}/.. \ - --with-readline=${STAGING_LIBDIR}/.. \ - " -RRECOMMENDS_${PN} = "pinentry" - -do_configure_prepend () { - # Else these could be used in prefernce to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 - rm -f ${S}/m4/libassuan.m4 - rm -f ${S}/m4/ksba.m4 - rm -f ${S}/m4/libgcrypt.m4 -} - -do_install_append() { - ln -sf gpg2 ${D}${bindir}/gpg - ln -sf gpgv2 ${D}${bindir}/gpgv -} - -RDEPENDS_${PN} = "gnutls" -- cgit 1.2.3-korg