Changeset 121213 for trunk/dports/gis


Ignore:
Timestamp:
Jun 20, 2014, 12:40:25 PM (5 years ago)
Author:
vince@…
Message:

Use libjson-c if available, otherwise the internal code.
Should fix #44098

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gis/gdal/Portfile

    r121188 r121213  
    225225
    226226# Python variants
    227 variant python24 conflicts python25 python26 python27 \
    228     description {Enable Python 2.4 support} {
    229     depends_lib-append      port:python24 \
    230                             port:py-numpy
    231     configure.args-delete   --without-python
    232     configure.args-append   --with-python
    233     set PYINST              ${frameworks_dir}/Python.framework/Versions/2.4
    234     build.args-append       PYTHON=python2.4
    235 }
    236 
    237 variant python25 conflicts python24 python26 python27 \
    238     description {Enable Python 2.5 support} {
    239     depends_lib-append      port:python25 \
    240                             port:py25-numpy
    241     configure.args-delete   --without-python
    242     configure.args-append   --with-python
    243     set PYINST              ${frameworks_dir}/Python.framework/Versions/2.5
    244     build.args-append       PYTHON=python2.5
    245     use_parallel_build      no
    246 }
    247 
    248227variant python26 conflicts python24 python25 python27 \
    249228    description {Enable Python 2.6 support} {
     
    339318# Perf variant to optimize code
    340319variant perf description {Optimize for speed} {
    341     configure.compiler      macports-clang-3.3
     320    configure.compiler      macports-clang-3.4
    342321    configure.cflags        -O3 -pipe -march=native
    343322    configure.cxxflags      -O3 -pipe -march=native
     
    345324
    346325default_variants    +expat
     326
     327# Choose external libjson if available (#44098)
     328if {[file exists ${prefix}/lib/libjson-c.dylib]} {
     329    configure.args-append   --with-libjson-c=${prefix}/lib
     330} else {
     331    configure.args-append   --with-libjson-c=internal
     332}
    347333
    348334# Postconfigure hack to avoid read ${include} .h files before
Note: See TracChangeset for help on using the changeset viewer.