[gdal-grass] 03/07: Add patch to link GRASS 7.2 libraries.

[Bas Couwenberg]

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

sebastic pushed a commit to branch ubuntu/trusty
in repository gdal-grass.

commit 646cf3d4bc9a30895b8b7132902cf2a4277305ee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jan 17 01:08:42 2017 +0100

    Add patch to link GRASS 7.2 libraries.
---
 debian/changelog             |  1 +
 debian/patches/grass72.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2b62e5a..6ae408c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libgdal-grass (2.1.0-1~trusty3) UNRELEASED; urgency=medium
 
   * Bump minimum GRASS version to 7.2.0.
   * Update rpath patch for GRASS 7.2.
+  * Add patch to link GRASS 7.2 libraries.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Dec 2016 19:45:29 +0100
 
diff --git a/debian/patches/grass72.patch b/debian/patches/grass72.patch
new file mode 100644
index 0000000..f9c2db6
--- /dev/null
+++ b/debian/patches/grass72.patch
@@ -0,0 +1,30 @@
+Description: Add libraries for GRASS 7.2.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/gdal/ticket/6785
+
+--- a/configure.in
++++ b/configure.in
+@@ -123,13 +123,20 @@ fi
+ 
+ if test "$with_grass" != "yes" ; then
+ 
+-  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
+   if test "$GRASS_SETTING" = "no" ; then
+-    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    if test "$GRASS_SETTING" = "no" ; then
++      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    fi
+   fi
+ 
+   if test "$GRASS_SETTING" != "no" ; then
+-    if test "$GRASS_SETTING" = "grass70+" ; then
++    if test "$GRASS_SETTING" = "grass72+" ; then
++      G_RASTLIBS="-lgrass_raster -lgrass_imagery"
++      G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
++      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
++    elif test "$GRASS_SETTING" = "grass70+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+       LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
diff --git a/debian/patches/series b/debian/patches/series
index 81ffa4b..15e9dda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 rpath
+grass72.patch

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