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

login
mail settings
Submitter Nitin A Kamble
Date July 10, 2012, 4:02 p.m.
Message ID <e7d19479741c45487a7b3e75219234e8339c9f79.1341935782.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/31661/
State Accepted
Commit c17511dee02428bb457d1ae08356ef2f8a7f9888
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
avoid this issue:

| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/libgcrypt-1.5.0-r0/image/usr/sbin': No such file or directory
NOTE: package libgcrypt-1.5.0-r0: task do_install: Failed

no PR bump as no change in the output

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-support/libgcrypt/libgcrypt.inc |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 42e47df..0d891d3 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -21,9 +21,6 @@  EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_install_append() {
 	install -d ${D}/${libdir}/pkgconfig
 	install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
-	
-	# Remove empty sbin directory since we don't build the daemon that would install there
-	rmdir ${D}${sbindir}
 }
 
 FILES_${PN}-dev += "${bindir}/dumpsexp ${bindir}/hmac256"