[otb] 02/05: Explicitly build with GCC 6, libshark FTBFS with GCC 7.

Bas Couwenberg sebastic at debian.org
Thu Aug 10 20:18:07 UTC 2017


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

sebastic pushed a commit to branch master
in repository otb.

commit eb3a9f7d780c0c61f559a141059995c3b8c81da2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 10 18:55:13 2017 +0200

    Explicitly build with GCC 6, libshark FTBFS with GCC 7.
---
 debian/changelog  | 6 ++++++
 debian/control    | 2 ++
 debian/control.in | 2 ++
 debian/rules      | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0bdd6c9..80fa1c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+otb (6.0.0+dfsg-4) UNRELEASED; urgency=medium
+
+  * Explicitly build with GCC 6, libshark FTBFS with GCC 7.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 10 Aug 2017 18:54:52 +0200
+
 otb (6.0.0+dfsg-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 2c6805c..b3782ae 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                dpkg-dev (>= 1.16.1~),
                cmake (>= 2.8.3),
+               gcc-6,
+               g++-6,
                libboost-date-time-dev,
                libboost-filesystem-dev,
                libboost-graph-dev,
diff --git a/debian/control.in b/debian/control.in
index 7c593e3..c3c1f93 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,6 +10,8 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                dpkg-dev (>= 1.16.1~),
                cmake (>= 2.8.3),
+               gcc-6,
+               g++-6,
                libboost-date-time-dev,
                libboost-filesystem-dev,
                libboost-graph-dev,
diff --git a/debian/rules b/debian/rules
index 3c8b0fc..585e4d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,9 @@ OTB_VERSION_FULL   = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PAT
 
 UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
+export CC=gcc-6
+export CXX=g++-6
+
 CMAKE_FLAGS = \
 	-DBUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS:BOOL=ON \

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



More information about the Pkg-grass-devel mailing list