Ticket #63561: Portfile.diff

File Portfile.diff, 1.1 KB (added by johnrosshunt, 2 years ago)

Just the diff

  • Portfile.

    old new  
    5858    test.target             test
    5959}
    6060
     61if {![info exists universal_possible]} {
     62    set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
     63}
    6164if {${universal_possible} && [variant_isset universal]} {
    62     lappend merger_configure_env(i386)      LDFLAGS=-Wl,-read_only_relocs,suppress,-no_compact_unwind
     65    foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
     66        # strip the automatic setting of host, meson does not accept
     67        set merger_host(${my_arch}) ""
     68    }
     69    lappend merger_configure_env(i386) \
     70                    LDFLAGS=-Wl,-read_only_relocs,suppress,-no_compact_unwind
    6371} elseif {${configure.build_arch} eq "i386"} {
    64     configure.env-append                LDFLAGS=-Wl,-read_only_relocs,suppress,-no_compact_unwind
     72    configure.env-append \
     73                    LDFLAGS=-Wl,-read_only_relocs,suppress,-no_compact_unwind
    6574}
    6675
    6776# developer docs are automatically built if doxygen and dot (graphviz) are present