Changeset 99378

Timestamp:

Nov 4, 2012, 4:46:47 AM (12 years ago)

Author:

ryandesign@…

Message:

unrar: modernize how we get the -arch flags

File:

• trunk/dports/archivers/unrar/Portfile (modified) (3 diffs)

trunk/dports/archivers/unrar/Portfile

@@ -31 +31 @@
 use_configure   no
 
-set CXXFLAGS        ${configure.cxxflags}
-set LDFLAGS         ${configure.ldflags}
-if {[variant_isset universal]} {
-    append CXXFLAGS    " ${configure.universal_cxxflags}"
-    append LDFLAGS     " ${configure.universal_ldflags}"
-} else {
-    append CXXFLAGS    " ${configure.cxx_archflags}"
-    append LDFLAGS     " ${configure.cc_archflags}"
-}
+variant universal {}
 
 if {[tbool configure.ccache]} {
@@ -45 +37 @@
 }
 
-build.env-append CXX="[join ${configure.cxx} " "]"
-build.env-append CXXFLAGS="${CXXFLAGS}"
-build.env-append LDFLAGS="${LDFLAGS}"
+build.env-append    CXX="[join ${configure.cxx}]" \
+                    CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
+                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
+
 build.args      -f makefile.unix
 
@@ -58 +51 @@
 }
 
-variant universal {}
-
 livecheck.type  regex
 livecheck.url   ${homepage}rar_add.htm