diff options
| author |   Marko Lindqvist <cazfi74@gmail.com> | 2013-01-26 00:26:37 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-31 12:29:18 +0000 |
| commit | 1489a69cecb1dcc3502a4c24beaea81e6ca6dacc (patch) | |
| tree | 9c38485c7c521e1d69010a1f66881e4c4fe97d12 /meta/recipes-graphics/harfbuzz | |
| parent | 1cdeff2c50a13c7238543ee1e4e1eb60753120e2 (diff) | |
| download | openembedded-core-1489a69cecb1dcc3502a4c24beaea81e6ca6dacc.tar.gz | |
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@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/harfbuzz')
| -rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch | 14 | ||||
| -rw-r--r-- | 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 0000000000..66823ede70 --- /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@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 0dd630157a..2e849e122e 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" |