[52192] trunk/dports/archivers/zlib

[toby at macports.org]

Revision: 52192
          http://trac.macports.org/changeset/52192
Author:   toby at macports.org
Date:     2009-06-11 16:14:11 -0700 (Thu, 11 Jun 2009)
Log Message:
-----------
Speed up build - muniversal is unnecessary.
Remove post-patch section that just adds redundant -arch/-isysroot flags.

Modified Paths:
--------------
    trunk/dports/archivers/zlib/Portfile
    trunk/dports/archivers/zlib/files/patch-Makefile-static.diff

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2009-06-11 21:54:15 UTC (rev 52191)
+++ trunk/dports/archivers/zlib/Portfile	2009-06-11 23:14:11 UTC (rev 52192)
@@ -1,7 +1,6 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               muniversal 1.0
 
 name                    zlib
 version                 1.2.3
@@ -32,22 +31,6 @@
 configure.args          --shared
 configure.universal_args
 
-# configure script does not recognize --host option
-array set merger_host {
-    ppc                 ""
-    i386                ""
-    ppc64               ""
-    x86_64              ""
-}
-
-# Ensure ldflags are used (see http://trac.macports.org/ticket/18841).
-post-patch {
-    if { ${configure.ldflags}!="-L${prefix}/lib" } {
-        configure.ldflags-delete  -L${prefix}/lib
-        reinplace "s|LDFLAGS=\"\\(.*\\)\"|LDFLAGS=\"\\1 ${configure.ldflags}\"|" ${worksrcpath}/configure
-    }
-}
-
 use_parallel_build      yes
 
 test.run                yes

Modified: trunk/dports/archivers/zlib/files/patch-Makefile-static.diff
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-static.diff	2009-06-11 21:54:15 UTC (rev 52191)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-static.diff	2009-06-11 23:14:11 UTC (rev 52192)
@@ -1,14 +1,16 @@
---- Makefile.in.orig	2007-03-31 13:43:59.000000000 -0700
-+++ Makefile.in	2007-03-31 13:45:02.000000000 -0700
-@@ -77,7 +77,7 @@
+--- Makefile.in.orig	2005-07-17 19:25:21.000000000 -0700
++++ Makefile.in	2009-06-11 16:04:22.000000000 -0700
+@@ -77,8 +77,8 @@
  	mv _match.o match.o
  	rm -f _match.s
  
 -$(SHAREDLIBV): $(OBJS)
+-	$(LDSHARED) -o $@ $(OBJS)
 +$(SHAREDLIBV): libz.a $(OBJS)
- 	$(LDSHARED) -o $@ $(OBJS)
++	$(LDSHARED) $(CFLAGS) -o $@ $(OBJS)
  	rm -f $(SHAREDLIB) $(SHAREDLIBM)
  	ln -s $@ $(SHAREDLIB)
+ 	ln -s $@ $(SHAREDLIBM)
 @@ -97,6 +97,7 @@
  	cp zlib.h zconf.h $(includedir)
  	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090611/334d73df/attachment.html>