[gdal-grass] 02/02: Update patches for GRASS 7.0.0.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 20 21:51:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository gdal-grass.
commit bd4e79fd1840a935cb4da56a7582c5a8c57756cc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Feb 20 22:40:04 2015 +0100
Update patches for GRASS 7.0.0.
---
debian/changelog | 1 +
debian/patches/grass7 | 19 +++----------------
debian/patches/hardening | 8 ++++----
debian/patches/rpath | 4 ++--
4 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 49b8800..6b44365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libgdal-grass (1.11.2-1~exp2) UNRELEASED; urgency=medium
* Bump minimum GRASS version to 7.0.0.
+ * Update patches for GRASS 7.0.0.
-- Bas Couwenberg <sebastic at debian.org> Fri, 20 Feb 2015 22:31:25 +0100
diff --git a/debian/patches/grass7 b/debian/patches/grass7
index 9bbee5b..1978940 100644
--- a/debian/patches/grass7
+++ b/debian/patches/grass7
@@ -16,10 +16,10 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
GRASS_GISBASE="$with_grass"
else
- AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found! Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
-+ # Check for GRASS 7.0.0RC2
-+ AC_CHECK_LIB(grass_gis.7.0.0RC2,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.0RC2 -lgrass_gmath.7.0.0RC2 -lgrass_gis.7.0.0RC2 -lgrass_datetime.7.0.0RC2 -lgrass_gproj.7.0.0RC2 -lgrass_vector.7.0.0RC2 -lgrass_dbmibase.7.0.0RC2 -lgrass_dbmiclient.7.0.0RC2 -lgrass_dgl.7.0.0RC2 -lgrass_dig2.7.0.0RC2 -lgrass_rtree.7.0.0RC2 -lgrass_linkm.7.0.0RC2 -lgrass_btree2.7.0.0RC2 -lgrass_ccmath.7.0.0RC2)
++ # Check for GRASS 7.0.0
++ AC_CHECK_LIB(grass_gis.7.0.0,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.0 -lgrass_gmath.7.0.0 -lgrass_gis.7.0.0 -lgrass_datetime.7.0.0 -lgrass_gproj.7.0.0 -lgrass_vector.7.0.0 -lgrass_dbmibase.7.0.0 -lgrass_dbmiclient.7.0.0 -lgrass_dgl.7.0.0 -lgrass_dig2.7.0.0 -lgrass_rtree.7.0.0 -lgrass_linkm.7.0.0 -lgrass_btree2.7.0.0 -lgrass_ccmath.7.0.0)
+ if test "$GRASS_SETTING" = "grass7+" ; then
-+ LIBS="-L$with_grass/lib -lgrass_raster.7.0.0RC2 -lgrass_gmath.7.0.0RC2 -lgrass_gis.7.0.0RC2 -lgrass_datetime.7.0.0RC2 -lgrass_gproj.7.0.0RC2 -lgrass_vector.7.0.0RC2 -lgrass_dbmibase.7.0.0RC2 -lgrass_dbmiclient.7.0.0RC2 -lgrass_dgl.7.0.0RC2 -lgrass_dig2.7.0.0RC2 -lgrass_rtree.7.0.0RC2 -lgrass_linkm.7.0.0RC2 -lgrass_btree2.7.0.0RC2 -lgrass_ccmath.7.0.0RC2 $LIBS"
++ LIBS="-L$with_grass/lib -lgrass_raster.7.0.0 -lgrass_gmath.7.0.0 -lgrass_gis.7.0.0 -lgrass_datetime.7.0.0 -lgrass_gproj.7.0.0 -lgrass_vector.7.0.0 -lgrass_dbmibase.7.0.0 -lgrass_dbmiclient.7.0.0 -lgrass_dgl.7.0.0 -lgrass_dig2.7.0.0 -lgrass_rtree.7.0.0 -lgrass_linkm.7.0.0 -lgrass_btree2.7.0.0 -lgrass_ccmath.7.0.0 $LIBS"
+ GRASS_INCLUDE="-I$with_grass/include"
+ GRASS_GISBASE="$with_grass"
+ else
@@ -41,16 +41,3 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
test -d ${GRASSTABLES_DIR}/driver || mkdir ${GRASSTABLES_DIR}/driver
test -d ${GRASSTABLES_DIR}/driver/db || mkdir ${GRASSTABLES_DIR}/driver/db
cp -r @GRASS_GISBASE@/driver/db/* ${GRASSTABLES_DIR}/driver/db/
-@@ -44,10 +44,10 @@ distclean: clean
-
-
- $(GLIBNAME): grass57dataset.o
-- $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
-+ $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
-
- $(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o
-- $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
-+ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
-
- %.o: %.cpp
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 44a81d2..11d79a0 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -18,12 +18,12 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
$(GLIBNAME): grass57dataset.o
-- $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
-+ $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
+- $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
++ $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
$(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o
-- $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
-+ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
+- $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
++ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
%.o: %.cpp
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
diff --git a/debian/patches/rpath b/debian/patches/rpath
index 38652cd..d7e9fe5 100644
--- a/debian/patches/rpath
+++ b/debian/patches/rpath
@@ -9,11 +9,11 @@ Last-Update: 2013-12-24
$(GLIBNAME): grass57dataset.o
- $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME)
-+ $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
++ $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
$(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o
- $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME)
-+ $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
++ $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
%.o: %.cpp
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git
More information about the Pkg-grass-devel
mailing list