diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-22 10:50:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-28 08:27:01 +0100 |
commit | 834245f0f76f6cdb9272e2b70ef4e807dd869bd7 (patch) | |
tree | 528b1f805ed86e3e4cf6603e389a90397451bada /meta/recipes-support/gnupg/gnupg_2.0.22.bb | |
parent | 81bb1ab604f573379fb66b568fbd89ae19a16f53 (diff) | |
download | openembedded-core-contrib-834245f0f76f6cdb9272e2b70ef4e807dd869bd7.tar.gz |
gnupg: Convert to use pkg-config for dependencies
Use pkg-config to find pth instead of pth-config and our own macros from
aclocal-copy.
(From OE-Core rev: 437ad15de308769c9251a37ed41dabed5653fc96)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg_2.0.22.bb')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.0.22.bb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.22.bb b/meta/recipes-support/gnupg/gnupg_2.0.22.bb index c1ed28c5e6..2746578bb2 100644 --- a/meta/recipes-support/gnupg/gnupg_2.0.22.bb +++ b/meta/recipes-support/gnupg/gnupg_2.0.22.bb @@ -10,7 +10,8 @@ PTH_libc-uclibc = "npth" inherit autotools gettext texinfo -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://pkgconfig.patch" SRC_URI[md5sum] = "ee22e7b4fdbfcb50229c2e6db6db291e" SRC_URI[sha256sum] = "437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251" @@ -23,6 +24,14 @@ EXTRA_OECONF = "--disable-ldap \ --with-readline=${STAGING_LIBDIR}/.. \ " +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 |