diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-02-13 16:40:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-21 17:00:48 +0000 |
commit | b2196ca25697bfb6c1412780a27cea5be1d80d6c (patch) | |
tree | 35303d85f167cba871df210d0859a7dd4877f0c1 /meta/recipes-core/zlib/zlib-1.2.6 | |
parent | 07616497363aeac1a5f02aa0f80ab663cff0aa71 (diff) | |
download | poky-b2196ca25697bfb6c1412780a27cea5be1d80d6c.tar.gz |
zlib: remove ldconfig call from install-libs
* it's called from install-libs target and when /etc/ld.so.cache is writeable by user running bitbake
then it creates invalid cache (in my case libstdc++.so cannot be found after building zlib(-native)
and I have to call touch */libstdc++.so && /sbin/ldconfig to fix it
(From OE-Core rev: b5c8add7f3ed58451cb460a242b4edd671ba618e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/zlib/zlib-1.2.6')
-rw-r--r-- | meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch new file mode 100644 index 0000000000..403b4825c9 --- /dev/null +++ b/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | |||
2 | When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache | ||
3 | (in my case libstdc++.so cannot be found after building zlib(-native) and I have to call | ||
4 | touch */libstdc++.so && /sbin/ldconfig to fix it. | ||
5 | |||
6 | So remove ldconfig call from make install-libs | ||
7 | |||
8 | Upstream-Status: Inappropriate [disable feature] | ||
9 | |||
10 | diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in | ||
11 | --- zlib-1.2.6.orig/Makefile.in 2012-01-28 23:48:50.000000000 +0100 | ||
12 | +++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100 | ||
13 | @@ -199,7 +199,6 @@ | ||
14 | rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ | ||
15 | ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ | ||
16 | ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ | ||
17 | - ($(LDCONFIG) || true) >/dev/null 2>&1; \ | ||
18 | fi | ||
19 | cp zlib.3 $(DESTDIR)$(man3dir) | ||
20 | chmod 644 $(DESTDIR)$(man3dir)/zlib.3 | ||