[gdal] 01/05: Build with external libjson-c instead of internal copy.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gdal.

commit 7c2e0dd1efb488c4845d638782332a5cc025ead7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 3 17:20:46 2016 +0200

    Build with external libjson-c instead of internal copy.
---
 debian/changelog                |  7 +++++++
 debian/control                  |  2 ++
 debian/libgdal20.symbols.common | 10 ----------
 debian/patches/libjson-c.patch  | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  1 +
 6 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b0fcfc..c302dcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (2.0.2+dfsg-5) UNRELEASED; urgency=medium
+
+  * Build with external libjson-c instead of internal copy.
+    (LP: #1565475)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Apr 2016 16:38:52 +0200
+
 gdal (2.0.2+dfsg-4) unstable; urgency=medium
 
   * Disable JasPer support, will be removed from stretch.
diff --git a/debian/control b/debian/control
index 3bccdd4..caae5ab 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Build-Depends: debhelper (>= 9),
                libfreexl-dev (>= 1.0.0),
                libkml-dev (>= 1.3.0~rc0-3),
                liburiparser-dev,
+               libjson-c-dev,
                default-jdk,
                ant
 Build-Conflicts: python-setuptools
@@ -109,6 +110,7 @@ Depends: libgdal20 (= ${binary:Version}),
          libcurl4-gnutls-dev | libcurl-ssl-dev,
          libspatialite-dev,
          libdap-dev,
+         libjson-c-dev,
          ${misc:Depends}
 Suggests: libgdal-doc
 Description: Geospatial Data Abstraction Library - Development files
diff --git a/debian/libgdal20.symbols.common b/debian/libgdal20.symbols.common
index 02c7b9b..2d26e20 100644
--- a/debian/libgdal20.symbols.common
+++ b/debian/libgdal20.symbols.common
@@ -1593,15 +1593,5 @@
  VSIUngetc at Base 1.8.0
  VSIUnlink at Base 1.8.0
  _CPLAssert at Base 1.8.0
- gdal_json_object_array_add at Base 2.0.1
- gdal_json_object_new_array at Base 2.0.1
- gdal_json_object_new_double at Base 2.0.1
- gdal_json_object_new_int64 at Base 2.0.1
- gdal_json_object_new_int at Base 2.0.1
- gdal_json_object_new_object at Base 2.0.1
- gdal_json_object_new_string at Base 2.0.1
- gdal_json_object_object_add at Base 2.0.1
- gdal_json_object_put at Base 2.0.1
- gdal_json_object_to_json_string_ext at Base 2.0.1
  json_object_new_double_with_precision at Base 2.0.1
  sqlite3_extension_init at Base 1.10.1
diff --git a/debian/patches/libjson-c.patch b/debian/patches/libjson-c.patch
new file mode 100644
index 0000000..7411b51
--- /dev/null
+++ b/debian/patches/libjson-c.patch
@@ -0,0 +1,22 @@
+Description: Link to external json-c.
+ Missing link caused build failure :
+ .
+ /usr/bin/ld: .libs/gdalinfo.o: undefined reference to symbol 'json_object_new_int'
+ //lib/x86_64-linux-gnu/libjson-c.so.2: error adding symbols: DSO missing from command line
+ collect2: error: ld returned 1 exit status
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/gdal/ticket/6440
+
+--- a/apps/GNUmakefile
++++ b/apps/GNUmakefile
+@@ -30,6 +30,10 @@ ifeq ($(HAVE_GEOS),yes)
+ CPPFLAGS 	:=	$(CPPFLAGS) -DHAVE_GEOS=1 $(GEOS_CFLAGS)
+ endif
+ 
++ifeq ($(LIBJSONC_SETTING),external)
++LNK_FLAGS :=	$(LNK_FLAGS) -ljson-c
++endif
++
+ NON_DEFAULT_LIST = 	multireadtest$(EXE) dumpoverviews$(EXE) \
+ 	gdalwarpsimple$(EXE) gdalflattenmask$(EXE) \
+ 	gdaltorture$(EXE) gdal2ogr$(EXE) test_ogrsf$(EXE) \
diff --git a/debian/patches/series b/debian/patches/series
index 9196c96..b366bc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ formatted-typo.patch
 remaining-typo.patch
 ogr-vrt-implement-CloseDependantDataset.patch
 message-typo.patch
+libjson-c.patch
diff --git a/debian/rules b/debian/rules
index 9975cc0..ecfb6d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,6 +124,7 @@ override_dh_auto_configure:
 			--with-armadillo=yes \
 			--with-liblzma=yes \
 			--with-epsilon=/usr \
+			--with-libjson-c=/usr \
 			CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"; \
 		mv GDALmake.opt GDALmake.opt-$$V; \
 	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git