Changeset 97531


Ignore:
Timestamp:
Sep 8, 2012, 5:36:58 AM (8 years ago)
Author:
ryandesign@…
Message:

glib2, glib2-devel: use conflicts_build

Location:
trunk/dports/devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/glib2-devel/Portfile

    r96967 r97531  
    44PortSystem                  1.0
    55PortGroup                   archcheck 1.0
     6PortGroup                   conflicts_build 1.0
    67
    78name                        glib2-devel
     
    5253                            lib/libffi.dylib
    5354
     55
     56# configure checks for libelf, and if found, the build fails; see #33948.
     57conflicts_build             libelf
     58
    5459# TODO: compiling with clang produces a glib that breaks other ports; see #32202, #32204, #32233.
    55 if {${configure.compiler} == "clang"} {
    56     configure.compiler llvm-gcc-4.2
    57 }
     60compiler.blacklist          clang
    5861
    5962# -lresolv is needed at least on Tiger PPC.
     
    7679    configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
    7780                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
    78    
    79     foreach {badport badfile} "libelf ${prefix}/lib/libelf.a" {
    80         if {[file exists ${badfile}]} {
    81             ui_error "${name} cannot be built while ${badport} is active."
    82             ui_error "Please deactivate ${badport} and try again."
    83             ui_error "You can reactivate ${badport} again later."
    84             return -code error "${badport} is installed"
    85         }
    86     }
    8781}
    8882
  • trunk/dports/devel/glib2/Portfile

    r95596 r97531  
    44PortSystem                  1.0
    55PortGroup                   archcheck 1.0
     6PortGroup                   conflicts_build 1.0
    67
    78name                        glib2
     
    5253                            lib/libffi.dylib
    5354
     55# configure checks for libelf, and if found, the build fails; see #33948.
     56conflicts_build             libelf
     57
    5458# TODO: compiling with clang produces a glib that breaks other ports; see #32202, #32204, #32233.
    55 if {${configure.compiler} == "clang"} {
    56     configure.compiler llvm-gcc-4.2
    57 }
     59compiler.blacklist          clang
    5860
    5961# -lresolv is needed at least on Tiger PPC.
     
    7678    configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
    7779                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
    78    
    79     foreach {badport badfile} "libelf ${prefix}/lib/libelf.a" {
    80         if {[file exists ${badfile}]} {
    81             ui_error "${name} cannot be built while ${badport} is active."
    82             ui_error "Please deactivate ${badport} and try again."
    83             ui_error "You can reactivate ${badport} again later."
    84             return -code error "${badport} is installed"
    85         }
    86     }
    8780}
    8881
Note: See TracChangeset for help on using the changeset viewer.