[Pkg-octave-devel] Octave 4.2 for stretch

Mike Miller mtmiller at debian.org
Thu Jul 7 04:13:43 UTC 2016


On Thu, Jul 07, 2016 at 04:35:11 +0200, Rafael Laboissière wrote:
> I uploaded version 4.1.0~hg.20160703.22033-2, which builds fine in almost
> all architectures [*].  Curiously it is failing for i386.

This is tracked upstream at https://savannah.gnu.org/bugs/?48319

> The next step will be to force Build-Depends on gcc-6.  Does anyone know how
> to do this properly?

I think something like this is the bare minimum to make this work
(sorry, untested).

diff --git a/debian/control b/debian/control
index c002ed7..40d708d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,10 @@ Build-Depends: automake,
   dpkg-dev (>= 1.16.1),
   epstool,
   flex,
+  g++-6,
   gawk,
-  gfortran,
+  gcc-6
+  gfortran-6,
   ghostscript,
   gnuplot-nox,
   javahelper,
@@ -217,7 +219,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich-dev (>= 1.8.8),
  libgl1-mesa-dev | libgl-dev,
  libblas-dev (>=1.2-7) | libblas.so, liblapack-dev (>=3.2.1-7) | liblapack.so,
- libfftw3-dev, gfortran, gcc, g++
+ libfftw3-dev, gfortran-6, gcc-6, g++-6
 Section: libdevel
 Description: Development files for the GNU Octave language
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
diff --git a/debian/rules b/debian/rules
index e74c9b3..69eed2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,11 @@ ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
 	--with-hdf5-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 endif
 
+# Force gcc-6
+export CC=gcc-6
+export CXX=g++-6
+export F77=gfortran-6
+
 %:
 	dh $@ --with autoreconf --parallel
 
-- 
mike



More information about the Pkg-octave-devel mailing list