Patchwork [28/39] libidn: clean up FILE after PACKAGE reorder

login
mail settings
Submitter Saul Wold
Date June 19, 2012, 3:59 p.m.
Message ID <8377ebf0d8b8b42bc3f556a5aebd6542248b039a.1340121099.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/30189/
State Accepted
Commit 1abf29813d77aa1c54c17cd7b1ac23f5f74def9f
Headers show

Comments

Saul Wold - June 19, 2012, 3:59 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/libidn/libidn_0.6.14.bb |    6 +++++-
 meta/recipes-extended/libidn/libidn_1.24.bb   |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb
index 67c9381..e740250 100644
--- a/meta/recipes-extended/libidn/libidn_0.6.14.bb
+++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://lib/idna.h;firstline=6;endline=18;md5=6d9d5532eb28b99e860262281c540d02 \
                     file://src/idn.c;firstline=6;endline=18;md5=41b6aec531cc6a9d54a6c4deee251bf5"
-PR = "r0"
+PR = "r1"
 
 inherit pkgconfig autotools gettext
 
@@ -25,3 +25,7 @@  do_configure_prepend() {
 	sed -i -e "/AC_REQUIRE(\[gl_USE_SYSTEM_EXTENSIONS/d" ${S}/lib/gl/m4/gnulib-comp.m4
 	rm -f ${S}/lib/gl/m4/extensions.m4
 }
+
+do_install_append() {
+	rm -rf ${D}${libdir}/Libidn.dll
+}
diff --git a/meta/recipes-extended/libidn/libidn_1.24.bb b/meta/recipes-extended/libidn/libidn_1.24.bb
index c6ecea7..a4ecce1 100644
--- a/meta/recipes-extended/libidn/libidn_1.24.bb
+++ b/meta/recipes-extended/libidn/libidn_1.24.bb
@@ -10,7 +10,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=9c9d9d207a3468a696a03368913d360b \
                     file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
                     file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \
                     file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb"
-PR = "r1"
+PR = "r2"
 
 inherit pkgconfig autotools gettext
 
@@ -28,5 +28,6 @@  FILES_idn = "${bindir}/*"
 EXTRA_OECONF = " --disable-tld"
 
 do_install_append() {
+	rm -rf ${D}${libdir}/Libidn.dll
 	rm -rf ${D}${datadir}/emacs
 }