[30932] trunk/dports/archivers/zlib

[source_changes at macosforge.org]

Revision: 30932
          http://trac.macosforge.org/projects/macports/changeset/30932
Author:   landonf at macports.org
Date:     2007-11-11 16:07:35 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
Use MacPorts' idea of the universal cflags

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

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2007-11-11 22:27:14 UTC (rev 30931)
+++ trunk/dports/archivers/zlib/Portfile	2007-11-12 00:07:35 UTC (rev 30932)
@@ -30,6 +30,11 @@
 	patchfiles-append	patch-Makefile-universal.diff
 }
 
+post-patch {
+    # Add the universal CFLAGS, if they're needed
+    reinplace s|@UNIVERSAL_CFLAGS@|${configure.universal_cflags}|g ${worksrcpath}/Makefile.in
+}
+
 configure.args	--shared
 configure.universal_args    
 

Modified: trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff	2007-11-11 22:27:14 UTC (rev 30931)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff	2007-11-12 00:07:35 UTC (rev 30932)
@@ -5,7 +5,7 @@
  
  $(SHAREDLIBV): libz.a $(OBJS)
 -	$(LDSHARED) -o $@ $(OBJS)
-+	$(LDSHARED) -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -o $@ $(OBJS)
++	$(LDSHARED) @UNIVERSAL_CFLAGS@ -o $@ $(OBJS)
  	rm -f $(SHAREDLIB) $(SHAREDLIBM)
  	ln -s $@ $(SHAREDLIB)
  	ln -s $@ $(SHAREDLIBM)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071111/ec4c61c6/attachment.html