[69918] trunk/dports/graphics/netpbm/Portfile

[mcalhoun at macports.org]

Revision: 69918
          http://trac.macports.org/changeset/69918
Author:   mcalhoun at macports.org
Date:     2010-07-21 13:39:41 -0700 (Wed, 21 Jul 2010)
Log Message:
-----------
netpbm: Allow universal build (Fixes #21240).

Modified Paths:
--------------
    trunk/dports/graphics/netpbm/Portfile

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2010-07-21 20:14:57 UTC (rev 69917)
+++ trunk/dports/graphics/netpbm/Portfile	2010-07-21 20:39:41 UTC (rev 69918)
@@ -24,9 +24,6 @@
 # please make sure to test it on OS X 10.4 as well!  Thanks!
 use_parallel_build  no
 
-# See http://trac.macports.org/ticket/21240
-universal_variant no
-
 depends_build   path:bin/perl:perl5
 
 depends_lib     port:zlib port:jpeg port:tiff \
@@ -49,13 +46,13 @@
 configure {
     file copy ${worksrcpath}/Makefile.config.in ${worksrcpath}/Makefile.config
     reinplace "s|^CC =.*\$|CC = ${configure.cc}|" ${worksrcpath}/Makefile.config
-    #if {[variant_isset universal]} {
-    #    reinplace "s|^#CFLAGS =.*\$|CFLAGS = ${configure.cppflags} ${configure.cflags} ${configure.universal_cflags}|" ${worksrcpath}/Makefile.config
-    #    reinplace "s|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} ${configure.universal_ldflags}|g" ${worksrcpath}/Makefile.config
-    #} else {
+    if {[variant_isset universal]} {
+        reinplace "s|^#CFLAGS =.*\$|CFLAGS = ${configure.cppflags} ${configure.cflags} ${configure.universal_cflags}|" ${worksrcpath}/Makefile.config
+        reinplace "s|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} ${configure.universal_ldflags}|g" ${worksrcpath}/Makefile.config
+    } else {
         reinplace "s|^#CFLAGS =.*\$|CFLAGS = ${configure.cppflags} ${configure.cflags} ${configure.cc_archflags}|" ${worksrcpath}/Makefile.config
         reinplace "s|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} ${configure.cc_archflags}|g" ${worksrcpath}/Makefile.config
-    #}
+    }
     reinplace "s|^CFLAGS_SHLIB =.*\$|CFLAGS_SHLIB = -fno-common|" ${worksrcpath}/Makefile.config
     reinplace "s|^TIFFLIB =.*\$|TIFFLIB = -ltiff|" ${worksrcpath}/Makefile.config
     reinplace "s|^JPEGLIB =.*\$|JPEGLIB = -ljpeg|" ${worksrcpath}/Makefile.config
@@ -67,6 +64,9 @@
 platform darwin {
     post-configure {
         set ldshlib "${configure.ldflags} -dynamiclib -install_name ${prefix}/lib/libnetpbm.\$(MAJ).dylib -compatibility_version \$(MAJ) -current_version ${version}"
+        if {[variant_isset universal]} {
+            set ldshlib "${ldshlib} ${configure.universal_ldflags}"
+        }
         reinplace "s|^NETPBMLIBTYPE =.*\$|NETPBMLIBTYPE = dylib|" ${worksrcpath}/Makefile.config
         reinplace "s|^NETPBMLIBSUFFIX =.*\$|NETPBMLIBSUFFIX = dylib|" ${worksrcpath}/Makefile.config
         reinplace "s|^LDSHLIB =.*\$|LDSHLIB = ${ldshlib}|" ${worksrcpath}/Makefile.config
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100721/eec564df/attachment-0001.html>