[oe-commits] Martin Jansa : zlib: remove ldconfig call from install-libs

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b5c8add7f3ed58451cb460a242b4edd671ba618e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b5c8add7f3ed58451cb460a242b4edd671ba618e

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Mon Feb 13 16:40:48 2012 +0100

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

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../zlib/zlib-1.2.6/remove.ldconfig.call.patch     |   20 ++++++++++++++++++++
 meta/recipes-core/zlib/zlib_1.2.6.bb               |    3 +++
 2 files changed, 23 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 0000000..403b482
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
@@ -0,0 +1,20 @@
+
+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.
+
+So remove ldconfig call from make install-libs
+
+Upstream-Status: Inappropriate [disable feature]
+
+diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in
+--- zlib-1.2.6.orig/Makefile.in	2012-01-28 23:48:50.000000000 +0100
++++ zlib-1.2.6/Makefile.in	2012-02-13 15:38:20.577700723 +0100
+@@ -199,7 +199,6 @@
+ 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+-	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+ 	fi
+ 	cp zlib.3 $(DESTDIR)$(man3dir)
+ 	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
diff --git a/meta/recipes-core/zlib/zlib_1.2.6.bb b/meta/recipes-core/zlib/zlib_1.2.6.bb
index a220773..54f8abf 100644
--- a/meta/recipes-core/zlib/zlib_1.2.6.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.6.bb
@@ -6,7 +6,10 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
 
+PR = "r1"
+
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
+           file://remove.ldconfig.call.patch \
            "
 SRC_URI[md5sum] = "dc2cfa0d2313ca77224b4d932b2911e9"
 SRC_URI[sha256sum] = "fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e"