Ticket #33836: doxygen-get_canonical_archflags.diff

File doxygen-get_canonical_archflags.diff, 1.7 KB (added by ryandesign (Ryan Schmidt), 10 years ago)

proposed patch

  • Portfile

     
    4848
    4949post-patch {
    5050        # ensure correct compilers and compiler options are used
    51         reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc} ${configure.cppflags} ${arch_flags}%" ${tmake_conf}
    52         reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.cppflags} ${arch_flags}%" ${tmake_conf}
    53         reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} ${arch_flags}%" ${tmake_conf}
    54         reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${arch_flags}%" ${tmake_conf}
     51        reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]%" ${tmake_conf}
     52        reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.cppflags} [get_canonical_archflags cxx]%" ${tmake_conf}
     53        reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} [get_canonical_archflags ld]%" ${tmake_conf}
     54        reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} [get_canonical_archflags ld]%" ${tmake_conf}
    5555
    5656        # may not be strictly necessary, but remove trailing '/' from DESTDIR
    5757        reinplace "s|\$(DESTDIR)/|\$(DESTDIR)|g" ${worksrcpath}/Makefile.in
     
    134134
    135135platform darwin {
    136136        # Specify the platform explicitly to avoid a universal build.
    137         global tmake_conf arch_flags
     137        global tmake_conf
    138138
    139139                set tmake_conf  ${worksrcpath}/tmake/lib/macosx-c++/tmake.conf
    140140                configure.args-append   --platform macosx-c++
    141         if { ![variant_isset universal] } {
    142                 set arch_flags ${configure.cc_archflags}
    143         } else {
    144                 set arch_flags ${configure.universal_cflags}
    145         }
    146141}