[Pkg-octave-commit] [SCM] octave-octgpr branch, master, updated. 56f34f6c400c7f1a9aad80a948a42b13991c5910

[Thomas Weber]

tags 560335 pending
thanks

The following commit has been merged in the master branch:
commit 8da71a9d8994aae1d0e72125ce392d989d0f5f13
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat Jan 16 21:57:37 2010 +0100

    Patch configure to build on sh4 (fix for #560335)

diff --git a/debian/changelog b/debian/changelog
index 02367ec..02e1310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+octave-octgpr (1.1.5-3) UNRELEASED; urgency=low
+
+  * New patch: octave-octgpr_sh4_support.diff (closes: #560335). Change
+    configure script to work correctly with sh4 architecture. Thanks to
+    Nobuhiro Iwamatsu for the patch. 
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 16 Jan 2010 21:57:12 +0100
+
 octave-octgpr (1.1.5-2) unstable; urgency=low
 
   [ Rafael Laboissiere ]
diff --git a/debian/patches/octave-octgpr_sh4_support.diff b/debian/patches/octave-octgpr_sh4_support.diff
new file mode 100644
index 0000000..8c1bb72
--- /dev/null
+++ b/debian/patches/octave-octgpr_sh4_support.diff
@@ -0,0 +1,19 @@
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Subject: Change configure script to work on sh4 architecture
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;filename=octave-octgpr_sh4_support.diff;att=1;bug=560335
+Bug-Debian: http://bugs.debian.org/560335
+Description: The original configure script was generated with autotools 2.61,
+ which doesn't take sh4 into account. Upstream code was changed to generate a a
+ fresh configure script at release time, so this patch is vendor-specific and
+ can be dropped with the next upstream release.
+--- a/src/configure	2009-12-10 13:09:31.000000000 +0000
++++ b/src/configure	2009-12-10 13:14:02.000000000 +0000
+@@ -4424,7 +4424,7 @@
+ 
+           ;;
+           # Ignore these flags.
+-        -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
++        -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little | -LANG:=* | -LIST:* | -LNO:*)
+           ;;
+         -lkernel32)
+           test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
diff --git a/debian/patches/series b/debian/patches/series
index 6f889c5..a3a5526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 autoload-yes.diff
+octave-octgpr_sh4_support.diff

-- 
octave-octgpr