[58054] trunk/dports/archivers/bzip2/Portfile

[ryandesign at macports.org]

Revision: 58054
          http://trac.macports.org/changeset/58054
Author:   ryandesign at macports.org
Date:     2009-09-21 04:00:18 -0700 (Mon, 21 Sep 2009)
Log Message:
-----------
bzip2: simplify how CC is passed to the Makefile and fix build for non-default build_arch; closes #21522

Modified Paths:
--------------
    trunk/dports/archivers/bzip2/Portfile

Modified: trunk/dports/archivers/bzip2/Portfile
===================================================================
--- trunk/dports/archivers/bzip2/Portfile	2009-09-21 10:54:10 UTC (rev 58053)
+++ trunk/dports/archivers/bzip2/Portfile	2009-09-21 11:00:18 UTC (rev 58054)
@@ -4,7 +4,7 @@
 
 name                    bzip2
 version                 1.0.5
-revision                2
+revision                3
 platforms               darwin freebsd linux sunos
 categories              archivers sysutils
 maintainers             ryandesign openmaintainer
@@ -59,15 +59,15 @@
     patchfiles-append   patch-Makefile-so.diff
 }
 
-post-configure {
-    reinplace "s|^CC=gcc|CC=${configure.cc}|" ${worksrcpath}/Makefile
+variant universal {}
+pre-build {
+    if {[variant_isset universal]} {
+        set my_archflags ${configure.universal_cflags}
+    } else {
+        set my_archflags ${configure.cc_archflags}
+    }
+    build.args          CC="${configure.cc} ${my_archflags}" \
+                        PREFIX=${prefix}
 }
 
-build.args              PREFIX="${prefix}"
-destroot.destdir        PREFIX="${destroot}${prefix}"
-
-variant universal {
-    post-configure {
-        reinplace "s|^CC=\\(.*\\)|CC=\\1 ${configure.universal_cflags}|" ${worksrcpath}/Makefile
-    }
-}
+destroot.destdir        PREFIX=${destroot}${prefix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090921/afd6d261/attachment.html>