[121213] trunk/dports/gis/gdal/Portfile

[vince at macports.org]

Revision: 121213
          https://trac.macports.org/changeset/121213
Author:   vince at macports.org
Date:     2014-06-20 05:40:25 -0700 (Fri, 20 Jun 2014)
Log Message:
-----------
Use libjson-c if available, otherwise the internal code. 
Should fix #44098

Modified Paths:
--------------
    trunk/dports/gis/gdal/Portfile

Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile	2014-06-20 10:08:48 UTC (rev 121212)
+++ trunk/dports/gis/gdal/Portfile	2014-06-20 12:40:25 UTC (rev 121213)
@@ -224,27 +224,6 @@
 }
 
 # Python variants
-variant python24 conflicts python25 python26 python27 \
-    description {Enable Python 2.4 support} {
-    depends_lib-append      port:python24 \
-                            port:py-numpy
-    configure.args-delete   --without-python
-    configure.args-append   --with-python
-    set PYINST              ${frameworks_dir}/Python.framework/Versions/2.4
-    build.args-append       PYTHON=python2.4
-}
-
-variant python25 conflicts python24 python26 python27 \
-    description {Enable Python 2.5 support} {
-    depends_lib-append      port:python25 \
-                            port:py25-numpy
-    configure.args-delete   --without-python
-    configure.args-append   --with-python
-    set PYINST              ${frameworks_dir}/Python.framework/Versions/2.5
-    build.args-append       PYTHON=python2.5
-    use_parallel_build      no
-}
-
 variant python26 conflicts python24 python25 python27 \
     description {Enable Python 2.6 support} {
     depends_lib-append      port:python26 \
@@ -338,13 +317,20 @@
 
 # Perf variant to optimize code
 variant perf description {Optimize for speed} {
-    configure.compiler      macports-clang-3.3
+    configure.compiler      macports-clang-3.4
     configure.cflags        -O3 -pipe -march=native
     configure.cxxflags      -O3 -pipe -march=native
 }
 
 default_variants    +expat
 
+# Choose external libjson if available (#44098)
+if {[file exists ${prefix}/lib/libjson-c.dylib]} {
+    configure.args-append   --with-libjson-c=${prefix}/lib
+} else {
+    configure.args-append   --with-libjson-c=internal
+}
+
 # Postconfigure hack to avoid read ${include} .h files before
 # GDAL own include directories
 post-configure {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140620/51d3b379/attachment-0001.html>