diff options
| author | Wenzong Fan <wenzong.fan@windriver.com> | 2012-08-03 11:30:21 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:18:45 +0100 |
| commit | e51d01a6b7336e997199966fb386c8a73a712fb3 (patch) | |
| tree | d117e8155f3901d97b24abc2f5b6cdb50be12e41 | |
| parent | ba218e743be4d4beec5faba188ea1236db774fb5 (diff) | |
| download | poky-e51d01a6b7336e997199966fb386c8a73a712fb3.tar.gz | |
gdk-pixbuf: fix parallel install issue
This patch fixes parallel install issue that lib libpixbufloader-png.la
depends on libgdk_pixbuf-2.0.la which will be regenerated during insta-
llation, if libgdk_pixbuf-2.0.la is regenerating and at the same time
libpixbufloader-png.la links it, the error will happen.
Error message is:
* usr/bin/ld: cannot find -lgdk_pixbuf-2.0
* collect2: ld returned 1 exit status
Make an explicit dependency to the libs install targets would fix this
issue.
[YOCTO #2883]
(From OE-Core rev: e6fb5a25a098bd639be4b176f58e552404232c93)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/extending-libinstall-dependencies.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 3 |
2 files changed, 44 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/extending-libinstall-dependencies.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/extending-libinstall-dependencies.patch new file mode 100644 index 0000000000..edbdced43a --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/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 | |||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb index 8e13115821..484fb12b30 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | |||
| @@ -15,12 +15,13 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${ | |||
| 15 | file://configure_nm.patch \ | 15 | file://configure_nm.patch \ |
| 16 | file://hardcoded_libtool.patch \ | 16 | file://hardcoded_libtool.patch \ |
| 17 | file://configure_fix.patch \ | 17 | file://configure_fix.patch \ |
| 18 | file://extending-libinstall-dependencies.patch \ | ||
| 18 | " | 19 | " |
| 19 | 20 | ||
| 20 | SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" | 21 | SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" |
| 21 | SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" | 22 | SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" |
| 22 | 23 | ||
| 23 | PR = "r3" | 24 | PR = "r4" |
| 24 | 25 | ||
| 25 | inherit autotools pkgconfig gettext | 26 | inherit autotools pkgconfig gettext |
| 26 | 27 | ||
