[gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.5.1-symlinks.patch zlib-1.2.5.1-version.patch

[gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.5.1-symlinks.patch zlib-1.2.5.1-version.patch

[Mike Frysinger (vapier)]

vapier      11/09/11 18:49:38

  Added:                zlib-1.2.5.1-symlinks.patch
                        zlib-1.2.5.1-version.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch?rev=1.1&content-type=text/plain

Index: zlib-1.2.5.1-symlinks.patch
===================================================================
From e41d99c135935b849e1e639632937829ff2000d8 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 11 Sep 2011 14:32:53 -0400
Subject: [PATCH] use relative symlinks for shared libs

The DESTDIR should not be encoded into symlinks as it is only a
temporary path.  Further, since we install the symlinks into the
same dir as the files, let's use relative links so that they can
always resolve.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 861970d..299bd1d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,8 +176,8 @@ install-libs: $(LIBS)
 	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
 	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	  ln -s $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-	  ln -s $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV) $(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)
-- 
1.7.6




1.1                  sys-libs/zlib/files/zlib-1.2.5.1-version.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5.1-version.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5.1-version.patch?rev=1.1&content-type=text/plain

Index: zlib-1.2.5.1-version.patch
===================================================================
From 70386acb30b690fc9fcfdac9e01c8ca29ff20ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edwin?= <edwintorok@gmail.com>
Date: Sun, 11 Sep 2011 10:00:52 +0300
Subject: [PATCH] fix ld error: unable to find version dependency `ZLIB_1.2.5'

---
 zlib.map |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zlib.map b/zlib.map
index 65bcf17..f65a125 100644
--- a/zlib.map
+++ b/zlib.map
@@ -69,4 +69,4 @@ ZLIB_1.2.3.5 {
 
 ZLIB_1.2.5.1 {
     deflatePending;
-} ZLIB_1.2.5;
+} ZLIB_1.2.3.5;
-- 
1.7.5.4