diff options
author | Ross Burton <ross.burton@intel.com> | 2013-05-23 14:40:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 16:48:24 +0100 |
commit | c99fd8dfebf2284bbed3ed3034e518ffef1aaf3f (patch) | |
tree | d3978f856f0c77a16530241c4454dd61569ac53d /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch | |
parent | 271ea8b628e5a18bff66fcf37efb7e1ef5c26754 (diff) | |
download | poky-c99fd8dfebf2284bbed3ed3034e518ffef1aaf3f.tar.gz |
gdk-pixbuf: upgrade to 2.28.1
Something along the lines of pngversion.patch was merged upstream, so drop that
patch.
Also use the new trim_version() function for a future-proof SRC_URI.
(From OE-Core rev: 30b32addd189e7acce73965c9176227d5f392ab9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch new file mode 100644 index 0000000000..edbdced43a --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch fixes parallel install issue that lib libpixbufloader-png.la | ||
4 | depends on libgdk_pixbuf-2.0.la which will be regenerated during insta- | ||
5 | llation, if libgdk_pixbuf-2.0.la is regenerating and at the same time | ||
6 | libpixbufloader-png.la links it, the error will happen. | ||
7 | |||
8 | Error message is: | ||
9 | * usr/bin/ld: cannot find -lgdk_pixbuf-2.0 | ||
10 | * collect2: ld returned 1 exit status | ||
11 | |||
12 | Make an explicit dependency to the libs install targets would fix this | ||
13 | issue. | ||
14 | |||
15 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
16 | --- | ||
17 | gdk-pixbuf/Makefile.am | 1 + | ||
18 | libdeps.mk | 3 +++ | ||
19 | 2 files changed, 4 insertions(+), 0 deletions(-) | ||
20 | create mode 100644 libdeps.mk | ||
21 | |||
22 | diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am | ||
23 | index 95a93a8..db44cae 100644 | ||
24 | --- a/gdk-pixbuf/Makefile.am | ||
25 | +++ b/gdk-pixbuf/Makefile.am | ||
26 | @@ -783,3 +783,4 @@ loaders.cache: | ||
27 | endif | ||
28 | |||
29 | -include $(top_srcdir)/git.mk | ||
30 | +-include $(top_srcdir)/libdeps.mk | ||
31 | diff --git a/libdeps.mk b/libdeps.mk | ||
32 | new file mode 100644 | ||
33 | index 0000000..d7a10a8 | ||
34 | --- /dev/null | ||
35 | +++ b/libdeps.mk | ||
36 | @@ -0,0 +1,3 @@ | ||
37 | +# Extending dependencies of install-loaderLTLIBRARIES: | ||
38 | +# The $(lib-LTLIBRARIES) is needed by relinking $(loader_LTLIBRARIES) | ||
39 | +install-loaderLTLIBRARIES: install-libLTLIBRARIES | ||
40 | -- | ||
41 | 1.7.6.1 | ||
42 | |||