[127838] trunk/dports/archivers/unzip/Portfile

[ryandesign at macports.org]

Revision: 127838
          https://trac.macports.org/changeset/127838
Author:   ryandesign at macports.org
Date:     2014-11-04 19:11:30 -0800 (Tue, 04 Nov 2014)
Log Message:
-----------
unzip: use the right -arch flags when not building universal (see https://lists.macosforge.org/pipermail/macports-users/2014-November/037090.html)

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

Modified: trunk/dports/archivers/unzip/Portfile
===================================================================
--- trunk/dports/archivers/unzip/Portfile	2014-11-05 02:54:25 UTC (rev 127837)
+++ trunk/dports/archivers/unzip/Portfile	2014-11-05 03:11:30 UTC (rev 127838)
@@ -26,12 +26,20 @@
                     sha1    abf7de8a4018a983590ed6f5cbd990d4740f8a22 \
                     rmd160  48af66606e9472e45fbb94bc4e285da23d1b89ba
 
+post-patch {
+    reinplace -E "/-O3/s|(LF2=\")|\\1[get_canonical_archflags ld]|" \
+        ${worksrcpath}/unix/Makefile
+}
+
 use_configure	no
 
+variant universal {}
+
+set localflags      [get_canonical_archflags cc]
+
 build.target	macosx
 build.args	    -f unix/Makefile \
                 CC="${configure.cc}"
-set localflags ${configure.cc_archflags}
 pre-build {
     # have to add this here so variants can modify it
     build.args-append LOCAL_UNZIP="${localflags}"
@@ -48,14 +56,6 @@
 		${destroot}${docdir}
 }
 
-variant universal {
-    set localflags ${configure.universal_cflags}
-	post-patch {
-		reinplace -E "/-O3/s|(LF2=\")|\\1${configure.universal_ldflags}|" \
-			${worksrcpath}/unix/Makefile
-	}
-}
-
 platform darwin 8 {
     append localflags " -DNO_LCHMOD"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141104/f8c38bf0/attachment.html>