[oe-commits] Marko Lindqvist : harfbuzz: fix install of version.h

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 72e753111996714a604c0835802fadc2e79afc0a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=72e753111996714a604c0835802fadc2e79afc0a

Author: Marko Lindqvist <cazfi74 at gmail.com>
Date:   Sat Jan 26 00:26:37 2013 +0200

harfbuzz: fix install of version.h

version.h is listed both in pkginclude_HEADERS (via $HBHEADERS) and
nodist_pkginclude_HEADERS. This double listing is likely cause of
the make install error:
/usr/bin/install: cannot create regular file `.../harfbuzz/0.9.10-r0/image/usr/include/harfbuzz/hb-version.h': File exists
Just remove the nodist_pkginclude_HEADERS entry. We're not creating
the tarball, and listing version.h here wouldn't prevent the other
listing from including it to tarball anyway.

Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../harfbuzz-0.9.10/avoid_double_version_h.patch   |   14 ++++++++++++++
 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb  |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch
new file mode 100644
index 0000000..66823ed
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Pending
+
+Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
+diff -Nurd harfbuzz-0.9.10/src/Makefile.am harfbuzz-0.9.10/src/Makefile.am
+--- harfbuzz-0.9.10/src/Makefile.am	2012-12-19 03:39:27.000000000 +0200
++++ harfbuzz-0.9.10/src/Makefile.am	2013-01-25 11:55:23.946354729 +0200
+@@ -210,7 +210,6 @@
+ libharfbuzz_la_LIBADD = $(HBLIBS)
+ EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency)
+ pkginclude_HEADERS = $(HBHEADERS)
+-nodist_pkginclude_HEADERS = hb-version.h
+
+ CLEANFILES += harfbuzz.def
+ harfbuzz.def: $(HBHEADERS)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
index 0dd6301..2e849e1 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
 
 SECTION = "libs"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
            file://disable_graphite.patch \
+           file://avoid_double_version_h.patch \
 "
 
 SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7"