zlib: fix installing when static-only
PATCH 1/1 zlib: fix installing when static-only
The switch from manual targets to using zlib's targets to fix shared building/installing doesn't work quite right as zlib itself doesn't handle static-only installs fully.
--- package/zlib/zlib-1.2.5-no-shared.patch | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 package/zlib/zlib-1.2.5-no-shared.patch
package/zlib/zlib-1.2.5-no-shared.patch new file +15 -0
@@ -0,0 +1,15 @@ +only install the shared lib if it's enabled + +--- a/Makefile.in ++++ b/Makefile.in +@@ -168,7 +168,9 @@ + - at if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi + - at if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi + cp $(STATICLIB) $(DESTDIR)$(libdir) +- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) ++ if test "$(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 + - at cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
Signature · 1 line
1.7.3.3
PATCH 1/1 zlib: fix installing when static-only
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Frysinger <[email protected]> writes:
Mike> The switch from manual targets to using zlib's targets to fix shared Mike> building/installing doesn't work quite right as zlib itself doesn't Mike> handle static-only installs fully.
Mike> Signed-off-by: Mike Frysinger <[email protected]>
Ehh, that seems very similar to the zlib-1.2.5-fix-static-install.patch we already have?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 zlib: fix installing when static-only
Quoted 7 lines · On Saturday, December 11, 2010 16:53:14 Peter Korsgaard wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Frysinger writes:
Mike> The switch from manual targets to using zlib's targets to fix shared Mike> building/installing doesn't work quite right as zlib itself doesn't Mike> handle static-only installs fully.
Ehh, that seems very similar to the zlib-1.2.5-fix-static-install.patch we already have?
i dont know what you're referring to. there are no patches currently:
http://git.buildroot.net/buildroot/tree/package/zlib
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101211/c71c2e0e/attachment.pgp>
PATCH 1/1 zlib: fix installing when static-only
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Frysinger <[email protected]> writes:
Quoted 1 line · Mike> On Saturday, December 11, 2010 16:53:14 Peter Korsgaard wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Frysinger writes:
Mike> The switch from manual targets to using zlib's targets to fix shared Mike> building/installing doesn't work quite right as zlib itself doesn't Mike> handle static-only installs fully.
Quoted 3 lines
Quoted 3 lines
Ehh, that seems very similar to the zlib-1.2.5-fix-static-install.patch we already have?
Mike> i dont know what you're referring to. there are no patches currently:
Mike> http://git.buildroot.net/buildroot/tree/package/zlib
Argh, you're right. I fixed it back in November, but apparently forgot to git add the file:
commit ab2f5567c1ca67c7f761486495d3d42f2b7c8eff
Author: Peter Korsgaard <[email protected]> Date: Wed Nov 24 16:14:52 2010 +0100
zlib: cleanup, fix install for static only build
Use 'make install' for installation, add a patch to make it work for static only builds, and add uninstall/clean targets while we're at it.
I've fixed that now, thanks. The patch has also been sent upstream.
Signature · 1 line
Bye, Peter Korsgaard