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

[ryandesign at macports.org]

Revision: 75216
          http://trac.macports.org/changeset/75216
Author:   ryandesign at macports.org
Date:     2011-01-17 23:58:30 -0800 (Mon, 17 Jan 2011)
Log Message:
-----------
netpbm: fully support changing build_arch; see #23412

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

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2011-01-18 07:24:30 UTC (rev 75215)
+++ trunk/dports/graphics/netpbm/Portfile	2011-01-18 07:58:30 UTC (rev 75216)
@@ -52,7 +52,7 @@
         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|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} ${configure.ld_archflags}|g" ${worksrcpath}/Makefile.config
     }
     reinplace "s|^CFLAGS_SHLIB =.*\$|CFLAGS_SHLIB = -fno-common|" ${worksrcpath}/Makefile.config
     reinplace "s|^TIFFLIB =.*\$|TIFFLIB = -ltiff|" ${worksrcpath}/Makefile.config
@@ -67,6 +67,8 @@
         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}"
+        } else {
+            set ldshlib "${ldshlib} ${configure.ld_archflags}"
         }
         reinplace "s|^NETPBMLIBTYPE =.*\$|NETPBMLIBTYPE = dylib|" ${worksrcpath}/Makefile.config
         reinplace "s|^NETPBMLIBSUFFIX =.*\$|NETPBMLIBSUFFIX = dylib|" ${worksrcpath}/Makefile.config
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110117/5cc5186d/attachment.html>