Patchwork [19/19] gpgme: fix build with automake 1.12.x

login
register
mail settings
Submitter Nitin A Kamble
Date July 10, 2012, 4:02 p.m.
Message ID <6041a3dca147e7182cb4bb751013d09c04214ef0.1341935782.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/31687/
State Accepted
Commit 4fc32e828113df50da154fcaf3eb3d56b9e72f09
Headers show

Comments

Nitin A Kamble - July 10, 2012, 4:02 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.

cleanup the do_install_append for automake 1.12.x

Avoids this build issue:
| rmdir: failed to remove `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/gpgme-1.3.2-r0/image/usr/libexec': No such file or directory
| ERROR: Function failed: do_install

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-support/gpgme/gpgme_1.3.2.bb |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-support/gpgme/gpgme_1.3.2.bb b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
index b3c1d46..f19892c5 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.2.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
@@ -17,7 +17,7 @@  DEPENDS = "libgpg-error libassuan ${PTH}"
 PTH_libc-uclibc = "npth"
 PTH = "pth"
 
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
                 --with-gpg=${bindir}/gpg --without-gpgsm"
@@ -28,7 +28,3 @@  PACKAGES =+ "${PN}-pth ${PN}-pthread"
 FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
 FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
 FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
-
-do_install_append() {
-	rmdir ${D}/usr/libexec
-}