Ticket #64623: dlang.diff

File dlang.diff, 5.5 KB (added by ryandesign (Ryan Carsten Schmidt), 3 years ago)

replaces dmd.diff

  • devel/dub/Portfile 

    diff --git a/devel/dub/Portfile b/devel/dub/Portfile
index 92a82d98721..5a880b8ab51 100644
    a b post-patch { 
    4646    reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" source/dub/dub.d
    4747}
    4848if {!${universal_possible} || ![variant_isset universal]} {
    49     if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
     49    if {${build_arch} in [list arm64 ppc64 x86_64]} {
    5050        build.env-append "DMD=${prefix}/bin/dmd -m64"
    5151    } else {
    5252        build.env-append "DMD=${prefix}/bin/dmd -m32"
    5353    }
    5454} else {
     55    lappend merger_build_env(arm64)  "DMD=${prefix}/bin/dmd -m64"
    5556    lappend merger_build_env(x86_64) "DMD=${prefix}/bin/dmd -m64"
    5657    lappend merger_build_env(i386)   "DMD=${prefix}/bin/dmd -m32"
    5758    lappend merger_build_env(ppc64)  "DMD=${prefix}/bin/dmd -m64"

  • lang/dmd-doc/Portfile 

    diff --git a/lang/dmd-doc/Portfile b/lang/dmd-doc/Portfile
index 8388406b314..a38cc151ed0 100644
    a b depends_build port:phobos 
    2828
    2929use_configure       no
    3030
    31 if {${build_arch} eq "x86_64"} {
     31if {${build_arch} in [list arm64 ppc64 x86_64]} {
    3232    set model 64
    3333} else {
    3434    set model 32

  • lang/dmd-tools/Portfile 

    diff --git a/lang/dmd-tools/Portfile b/lang/dmd-tools/Portfile
index 5a10691e7d4..08230717dd8 100644
    a b if {![info exists universal_possible]} { 
    4444    set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
    4545}
    4646if {!${universal_possible} || ![variant_isset universal]} {
    47     if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
     47    if {${build_arch} in [list arm64 ppc64 x86_64]} {
    4848        build.args-append    MODEL=64
    4949        destroot.args-append MODEL=64
    5050    } else {
    … … if {!${universal_possible} || ![variant_isset universal]} { 
    5252        destroot.args-append MODEL=32
    5353    }
    5454} else {
     55    lappend merger_build_args(arm64)     MODEL=64
    5556    lappend merger_build_args(x86_64)    MODEL=64
    5657    lappend merger_build_args(i386)      MODEL=32
    5758    lappend merger_build_args(ppc64)     MODEL=64
    5859    lappend merger_build_args(ppc)       MODEL=32
    5960
     61    lappend merger_destroot_args(arm64)  MODEL=64
    6062    lappend merger_destroot_args(x86_64) MODEL=64
    6163    lappend merger_destroot_args(i386)   MODEL=32
    6264    lappend merger_destroot_args(ppc64)  MODEL=64

  • lang/dmd/Portfile 

    diff --git a/lang/dmd/Portfile b/lang/dmd/Portfile
index 665c829ddd6..2eac0a12919 100644
    a b if {![info exists universal_possible]} { 
    5151    set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
    5252}
    5353if {!${universal_possible} || ![variant_isset universal]} {
    54     if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
     54    if {${build_arch} in [list arm64 ppc64 x86_64]} {
    5555        build.args-append MODEL=64
    5656        destroot.args-append MODEL=64
    5757    } else {
    … … if {!${universal_possible} || ![variant_isset universal]} { 
    5959        destroot.args-append MODEL=32
    6060    }
    6161} else {
     62    lappend merger_build_args(arm64)  MODEL=64
    6263    lappend merger_build_args(x86_64) MODEL=64
    6364    lappend merger_build_args(i386)   MODEL=32
    6465    lappend merger_build_args(ppc64)  MODEL=64
    6566    lappend merger_build_args(ppc)    MODEL=32
     67    lappend merger_destroot_args(arm64)  MODEL=64
    6668    lappend merger_destroot_args(x86_64) MODEL=64
    6769    lappend merger_destroot_args(i386)   MODEL=32
    6870    lappend merger_destroot_args(ppc64)  MODEL=64

  • lang/druntime/Portfile 

    diff --git a/lang/druntime/Portfile b/lang/druntime/Portfile
index 964b64d1198..a62c2af1802 100644
    a b if {![info exists universal_possible]} { 
    3939    set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
    4040}
    4141if {!${universal_possible} || ![variant_isset universal]} {
    42     if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
     42    if {${build_arch} in [list arm64 ppc64 x86_64]} {
    4343        build.args-append MODEL=64
    4444    } else {
    4545        build.args-append MODEL=32
    4646    }
    4747} else {
     48    lappend merger_build_args(arm64)  MODEL=64
    4849    lappend merger_build_args(x86_64) MODEL=64
    4950    lappend merger_build_args(i386)   MODEL=32
    5051    lappend merger_build_args(ppc64)  MODEL=64
    … … destroot { 
    6263    file copy ${worksrcpath}/benchmark ${destroot}${prefix}/share/${name}
    6364}
    6465
    65 
    6666github.livecheck.regex  {([^"-]+)}

  • lang/phobos/Portfile 

    diff --git a/lang/phobos/Portfile b/lang/phobos/Portfile
index c9a1c5f5432..c632870cad2 100644
    a b if {![info exists universal_possible]} { 
    5959    set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
    6060}
    6161if {!(${universal_possible} && [variant_isset universal])} {
    62     if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
     62    if {${build_arch} in [list arm64 ppc64 x86_64]} {
    6363        build.args-append MODEL=64 DRUNTIME=${workpath}/druntime/${build_arch}/libdruntime.a
    6464    } else {
    6565        build.args-append MODEL=32 DRUNTIME=${workpath}/druntime/${build_arch}/libdruntime.a
    6666    }
    6767} else {
     68    lappend merger_build_args(arm64)  MODEL=64 DRUNTIME=${workpath}/druntime/arm64/libdruntime.a
    6869    lappend merger_build_args(x86_64) MODEL=64 DRUNTIME=${workpath}/druntime/x86_64/libdruntime.a
    6970    lappend merger_build_args(i386)   MODEL=32 DRUNTIME=${workpath}/druntime/i386/libdruntime.a
    7071    lappend merger_build_args(ppc64)  MODEL=64 DRUNTIME=${workpath}/druntime/ppc64/libdruntime.a