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>
This commit is contained in:
Wenzong Fan 2012-08-03 11:30:21 +08:00 committed by Richard Purdie
parent ba218e743b
commit e51d01a6b7
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,42 @@
Upstream-Status: Pending
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.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
gdk-pixbuf/Makefile.am | 1 +
libdeps.mk | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 libdeps.mk
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 95a93a8..db44cae 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -783,3 +783,4 @@ loaders.cache:
endif
-include $(top_srcdir)/git.mk
+-include $(top_srcdir)/libdeps.mk
diff --git a/libdeps.mk b/libdeps.mk
new file mode 100644
index 0000000..d7a10a8
--- /dev/null
+++ b/libdeps.mk
@@ -0,0 +1,3 @@
+# Extending dependencies of install-loaderLTLIBRARIES:
+# The $(lib-LTLIBRARIES) is needed by relinking $(loader_LTLIBRARIES)
+install-loaderLTLIBRARIES: install-libLTLIBRARIES
--
1.7.6.1

View File

@ -15,12 +15,13 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
file://configure_nm.patch \
file://hardcoded_libtool.patch \
file://configure_fix.patch \
file://extending-libinstall-dependencies.patch \
"
SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
PR = "r3"
PR = "r4"
inherit autotools pkgconfig gettext