Changeset 114641 for trunk/dports/tex


Ignore:
Timestamp:
Dec 13, 2013, 5:03:58 AM (6 years ago)
Author:
larryv@…
Message:

texlive-bin: Use configure.objcxx{,flags} during build (#41791).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/tex/texlive-bin/Portfile

    r114164 r114641  
    191191configure.env-append        LIBRARY_PATH=${prefix}/lib
    192192
    193 set cxx_stdlibflags {}
     193# work around bug in texlive makefiles where $OBJC is not recorded
     194# during configure phase
     195build.env                   OBJC=${configure.objc} \
     196                            OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
     197                            OBJCXX=${configure.objcxx}
     198
    194199if {[info exists configure.cxx_stdlib] &&
    195200    ${configure.cxx_stdlib} ne {} &&
    196201    [string match *clang* ${configure.cxx}]
    197202} then {
    198     set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    199 }
    200 
    201 # TODO: Remove when base supports OBJCXX and OBJCXXFLAGS (2.2.1?).
    202 configure.env-append        OBJCXX=${configure.cxx} \
    203                             OBJCXXFLAGS="${configure.objcflags} ${cxx_stdlibflags} [get_canonical_archflags objc]"
    204 
    205 # work around bug in texlive makefiles where $OBJC is not recorded
    206 # during configure phase
    207 build.env                   OBJC=${configure.objc} \
    208                             OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
    209                             OBJCXX=${configure.cxx} \
    210                             OBJCXXFLAGS="${configure.objcflags} ${cxx_stdlibflags} [get_canonical_archflags objc]"           
     203    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx] -stdlib=${configure.cxx_stdlib}"
     204} else {
     205    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx]"
     206}
    211207
    212208post-destroot   {
Note: See TracChangeset for help on using the changeset viewer.