[Pkg-octave-devel] Bug#666142: octave: Please support -mieee option to mkoctfile

[Nobuhiro Iwamatsu]

Source: octave
Version: 3.6.1-4
Severity: wishlist
Tag:patch
User: debian-sh4 at superh.org
Usertags: sh4
X-Debbugs-CC: debian-superh at lists.debian.org, debian-alpha at lists.debian.org

Hi,

octave-octcdf FTBFS on Alpha. (maybe on sh4 too.)
 http://buildd.debian-ports.org/status/fetch.php?pkg=octave-octcdf&arch=alpha&ver=1.1.4-1&stamp=1332884789

Because mkoctfile does not support mieee option, this problem happens.

-----
octave-forge is configured with
   octave:      /usr/bin/octave (version 3.6.1)
   mkoctfile:	/usr/bin/mkoctfile for Octave 1
   octcdf toolbox: yes
   netCDF compiler flags: -D_FORTIFY_SOURCE=2 -mieee
   netCDF libraries: -Wl,--as-needed -lnetcdf

find . -name NOINSTALL -print    # shows which toolboxes won't be installed

mkoctfile: unrecognized argument -mieee
make[1]: *** [ov-netcdf.o] Error 1
'make' returned the following error: make[1]: Entering directory
`/tmp/oct-IU8IvA/src'
/usr/bin/mkoctfile -DHAVE_OCTAVE_ -v -c ov-netcdf.cc
-D_FORTIFY_SOURCE=2 -mieee -DHAVE_OCTAVE_INT
make[1]: Leaving directory `/tmp/oct-IU8IvA/src'
error: called from `pkg>configure_make' in file
/usr/share/octave/3.6.1/m/pkg/pkg.m near line 1391, column 9
error: called from:
error:   /usr/share/octave/3.6.1/m/pkg/pkg.m at line 834, column 5
error:   /usr/share/octave/3.6.1/m/pkg/pkg.m at line 383, column 9
make: *** [install-pkg] Error 1
-----

I made a patch which revise this. However, I do not yet check it.
Could you check and apply?

Best regards,
 Nobuhiro

-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6
-------------- next part --------------
diff --git a/mkoctfile.cc.in b/mkoctfile.cc.in
index 65a3f6b..2eb3578 100644
--- a/mkoctfile.cc.in
+++ b/mkoctfile.cc.in
@@ -542,6 +542,12 @@ main (int argc, char **argv)
 	{
 	  pass_on_options += (" " + arg);
 	}
+      else if (arg == "-mieee")
+	{
+	  vars["ALL_CFLAGS"] += " -mieee";
+	  vars["ALL_CXXFLAGS"] += " -mieee";
+	  vars["ALL_FFLAGS"] += " -mieee";
+	}
       else
 	{
 	  cerr << "mkoctfile: unrecognized argument " << arg;
diff --git a/mkoctfile.in b/mkoctfile.in
index f6d46ba..40bd7e0 100644
--- a/mkoctfile.in
+++ b/mkoctfile.in
@@ -325,6 +325,11 @@ EOF
     -W*)
       pass_on_options="$pass_on_options $1"
     ;;
+    -mieee)
+      ALL_CFLAGS="$ALL_CFLAGS -mieee"
+      ALL_CXXFLAGS="$ALL_CXXFLAGS -mieee"
+      ALL_FFLAGS="$ALL_FFLAGS -mieee"
+    ;;
     *)
       echo "mkoctfile: unrecognized argument $1" 1>&2
       exit 1