[Pkg-octave-commit] r1804 - in matwrap/trunk/debian: . patches

[Thomas Weber]

Author: thomas-guest
Date: 2008-04-27 16:34:47 +0000 (Sun, 27 Apr 2008)
New Revision: 1804

Modified:
   matwrap/trunk/debian/changelog
   matwrap/trunk/debian/patches/new_declaration_of_strcmp
Log:
Revise bug fix for 477041, the former one didn't work.
Pass -fno-exceptions to mkoctfile


Modified: matwrap/trunk/debian/changelog
===================================================================
--- matwrap/trunk/debian/changelog	2008-04-27 14:29:00 UTC (rev 1803)
+++ matwrap/trunk/debian/changelog	2008-04-27 16:34:47 UTC (rev 1804)
@@ -1,7 +1,7 @@
 matwrap (0.57-11) UNRELEASED; urgency=low
 
-  * New patch: new_declaration_of_strcmp, using the declaration of strcmp()
-    from /usr/include/strings.h (closes: #477041) 
+  * New patch: new_declaration_of_strcmp, add -fno-exception to mkoctfile()
+    call, catering for GCC 4.3 (closes: #477041) 
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 27 Apr 2008 17:36:10 +0200
 

Modified: matwrap/trunk/debian/patches/new_declaration_of_strcmp
===================================================================
--- matwrap/trunk/debian/patches/new_declaration_of_strcmp	2008-04-27 14:29:00 UTC (rev 1803)
+++ matwrap/trunk/debian/patches/new_declaration_of_strcmp	2008-04-27 16:34:47 UTC (rev 1804)
@@ -1,14 +1,23 @@
 Copy declaration from /usr/include/string.h into simple.h
 Bug fix for #477041
---- a/share/matwrap/Examples/simple/simple.h
-+++ b/share/matwrap/Examples/simple/simple.h
-@@ -91,7 +91,8 @@
- }
+--- a/share/matwrap/Examples/simple/Makefile
++++ b/share/matwrap/Examples/simple/Makefile
+@@ -58,12 +58,17 @@
+ #
+ MKOCTFILE = mkoctfile
  
- extern "C" {
--extern int strcmp(const char *, const char *); //%name real_strcmp
-+extern int strcmp(const char *, const char *)
-+     __THROW __attribute_pure__ __nonnull ((1, 2)); //%name real_strcmp
- 				// Call the real strcmp function from matlab,
- 				// not the hacked one that returns 0 or 1,
- 				// but one that returns -1, 0, 1.
++# gcc-4.3 doesn't like the exception definition in /usr/include/strings.h mixed
++# with the definition in simple.g
++XTRA_CXXFLAGS := $(shell $(MKOCTFILE) -p XTRA_CXXFLAGS)
++XTRA_CXXFLAGS := $(XTRA_CXXFLAGS) -fno-exceptions
++
+ octave:: simple_octave.oct
+ 
+ simple_octave.oct: simple.h
+ 	$(MATWRAP) -language octave simple.h \
+ 		-o simple_octave.cc -stub simple_stub.m
+-	$(MKOCTFILE) simple_octave.cc
++	XTRA_CXXFLAGS="$(XTRA_CXXFLAGS)" $(MKOCTFILE) simple_octave.cc
+ 
+ ########################################################################
+ #