[csw-devel] SF.net SVN: gar:[18401] csw/mgar/pkg/zlib/trunk

[wahwah at users.sourceforge.net]

Revision: 18401
          http://gar.svn.sourceforge.net/gar/?rev=18401&view=rev
Author:   wahwah
Date:     2012-06-14 10:16:40 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
zlib/trunk: updated one patch which didn't apply any more

Modified Paths:
--------------
    csw/mgar/pkg/zlib/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch

Removed Paths:
-------------
    csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2012-06-14 08:06:12 UTC (rev 18400)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2012-06-14 10:16:40 UTC (rev 18401)
@@ -1,4 +1,4 @@
-# $Id$
+#: $Id$
 
 NAME = zlib
 VERSION = 1.2.7
@@ -24,7 +24,7 @@
 DISTFILES  = $(DISTNAME).tar.bz2
 DISTFILES += COPYING
 
-PATCHFILES += Makefile.in.diff
+PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch
 PATCHFILES += configure.diff
 
 PACKAGES += CSWlibz1

Added: csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch	                        (rev 0)
+++ csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch	2012-06-14 10:16:40 UTC (rev 18401)
@@ -0,0 +1,25 @@
+From 028ff36f20ffd5d5edf79af662e34908ce031a36 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 14 Jun 2012 12:12:06 +0200
+Subject: [PATCH] Add -h to the linker invocation
+
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 241deed..13bb227 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -160,7 +160,7 @@ minigzip64.o: test/minigzip.c zlib.h zconf.h
+ 	- at mv objs/$*.o $@
+ 
+ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
+-	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
++ 	$(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
+ 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+ 	ln -s $@ $(SHAREDLIB)
+ 	ln -s $@ $(SHAREDLIBM)
+-- 
+1.7.10.3
+

Deleted: csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff	2012-06-14 08:06:12 UTC (rev 18400)
+++ csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff	2012-06-14 10:16:40 UTC (rev 18401)
@@ -1,11 +0,0 @@
---- zlib-1.2.5/Makefile.in.orig	2010-05-26 12:54:35.283218000 +0200
-+++ zlib-1.2.5/Makefile.in	2010-05-26 13:13:37.622441685 +0200
-@@ -137,7 +137,7 @@
- 	- at mv objs/$*.o $@
- 
- $(SHAREDLIBV): $(PIC_OBJS)
--	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
-+	$(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
- 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIBM)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.