gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zlib: really fix install for static only builds

Browse Source 
Commit ab2f5567c1 (cleanup, fix install for static only build) forgot
to add the patch for static only builds, even though the commit message
mentioned it.

Thanks to Mike for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-12-12 08:51:58 +01:00
parent b7a2358f0b
commit cc37a07f28
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -4,7 +4,7 @@
compilation, and cache is stored in ~/.buildroot-ccache.
Updated/fixed packages: busybox, cloop, libconfig, m4,
openssh, openssl, qt, usbutils, xz
openssh, openssl, qt, usbutils, xz, zlib
New packages: dhrystone, lsuio, rsh-redone, whetstone

24
package/zlib/zlib-1.2.5-fix-static-install.patch Normal file
View File

@ -0,0 +1,24 @@
[PATCH] fix make install for static builds
Only try to install shared lib if we've built one.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: zlib-1.2.5/Makefile.in
===================================================================
--- zlib-1.2.5.orig/Makefile.in
+++ zlib-1.2.5/Makefile.in
@@ -168,7 +168,9 @@ install-libs: $(LIBS)
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
cp $(STATICLIB) $(DESTDIR)$(libdir)
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+ fi
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \