[114641] trunk/dports/tex/texlive-bin/Portfile

[larryv at macports.org]

Revision: 114641
          https://trac.macports.org/changeset/114641
Author:   larryv at macports.org
Date:     2013-12-12 21:03:58 -0800 (Thu, 12 Dec 2013)
Log Message:
-----------
texlive-bin: Use configure.objcxx{,flags} during build (#41791).

Modified Paths:
--------------
    trunk/dports/tex/texlive-bin/Portfile

Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile	2013-12-13 03:39:54 UTC (rev 114640)
+++ trunk/dports/tex/texlive-bin/Portfile	2013-12-13 05:03:58 UTC (rev 114641)
@@ -190,25 +190,21 @@
 configure.cppflags-append   -isystem${prefix}/include
 configure.env-append        LIBRARY_PATH=${prefix}/lib
 
-set cxx_stdlibflags {}
+# work around bug in texlive makefiles where $OBJC is not recorded
+# during configure phase
+build.env                   OBJC=${configure.objc} \
+                            OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
+                            OBJCXX=${configure.objcxx}
+
 if {[info exists configure.cxx_stdlib] &&
     ${configure.cxx_stdlib} ne {} &&
     [string match *clang* ${configure.cxx}]
 } then {
-    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
+    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx] -stdlib=${configure.cxx_stdlib}"
+} else {
+    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx]"
 }
 
-# TODO: Remove when base supports OBJCXX and OBJCXXFLAGS (2.2.1?).
-configure.env-append        OBJCXX=${configure.cxx} \
-                            OBJCXXFLAGS="${configure.objcflags} ${cxx_stdlibflags} [get_canonical_archflags objc]"
-
-# work around bug in texlive makefiles where $OBJC is not recorded
-# during configure phase
-build.env                   OBJC=${configure.objc} \
-                            OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
-                            OBJCXX=${configure.cxx} \
-                            OBJCXXFLAGS="${configure.objcflags} ${cxx_stdlibflags} [get_canonical_archflags objc]"            
-
 post-destroot   {
     # Anything that gets installed into texmf-dist will be installed
     # by one of the texmf ports
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131212/87c17ffe/attachment.html>