Changeset 145156


Ignore:
Timestamp:
Jan 27, 2016, 3:37:11 AM (3 years ago)
Author:
khindenburg@…
Message:

p7zip: attempt to use the right compiler on multiple architecture #50146

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/archivers/p7zip/Portfile

    r144942 r145156  
    3737
    3838configure {
    39     copy -force ${worksrcpath}/makefile.macosx_llvm_64bits ${worksrcpath}/makefile.machine
    40     # this also corrects a typo in the makefile ('XX' rather than 'CXX')
    41     reinplace "s|^XX=/usr/bin/llvm-g++|CXX=${configure.cxx}|" \
     39    if {${build_arch} eq "x86_64"} {
     40        copy -force ${worksrcpath}/makefile.macosx_llvm_64bits ${worksrcpath}/makefile.machine
     41        # this also corrects a typo in the makefile ('XX' rather than 'CXX')
     42        reinplace "s|^XX=/usr/bin/llvm-g++|CXX=${configure.cxx}|g" \
     43             ${worksrcpath}/makefile.machine
     44        reinplace "s|^CC=/usr/bin/llvm-gcc|CC=${configure.cc}|g" \
     45             ${worksrcpath}/makefile.machine
     46    } else {
     47        if {${build_arch} eq "ppc"} {
     48            copy -force ${worksrcpath}/makefile.macosx_gcc_32bits_ppc ${worksrcpath}/makefile.machine
     49        } elseif {${build_arch} eq "ppc64"} {
     50            copy -force ${worksrcpath}/makefile.macosx_gcc_64bits ${worksrcpath}/makefile.machine
     51        } else {
     52            copy -force ${worksrcpath}/makefile.macosx_gcc_32bits_asm ${worksrcpath}/makefile.machine
     53        }
     54        reinplace "s|^CXX=c++|CXX=${configure.cxx}|g" \
    4255            ${worksrcpath}/makefile.machine
    43     reinplace "s|^CC=/usr/bin/llvm-gcc|CC=${configure.cc}|" \
     56        reinplace "s|^CC=cc|CC=${configure.cc}|g" \
    4457            ${worksrcpath}/makefile.machine
    45     reinplace "s|-m64||g" \
    46             ${worksrcpath}/makefile.machine
    47     reinplace "s|\$(LOCAL_FLAGS)|[get_canonical_archflags] \$(LOCAL_FLAGS)|" \
    48             ${worksrcpath}/makefile.machine
     58    }
     59    reinplace "s|\$(LOCAL_FLAGS)|[get_canonical_archflags] \$(LOCAL_FLAGS)|g" \
     60        ${worksrcpath}/makefile.machine
    4961}
    5062
Note: See TracChangeset for help on using the changeset viewer.