Mercurial > mxe-octave

comparison src/msvc-octave-1.patch @ 3319:2636b3458f4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/msvc-octave-1.patch: Update to octave 3.7.7.
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 12 Nov 2013 20:54:29 -0500
parents 2069703f3826
children b251f4358147
comparison
equal deleted inserted replaced
3318:2640cb06f42d 3319:2636b3458f4d
5 dnl Use -isystem so we don't get warnings from llvm headers 5 dnl Use -isystem so we don't get warnings from llvm headers
6 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" 6 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
7 LLVM_CXXFLAGS= 7 LLVM_CXXFLAGS=
8 - LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" 8 - LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
9 + LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`" 9 + LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`"
10 LLVM_LIBS=`$LLVM_CONFIG --libs` 10
11 11
12 dnl 12 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
13 @@ -1186,7 +1186,7 @@ 13 @@ -1186,7 +1186,7 @@
14 XTRA_CRUFT_SH_LDFLAGS= 14 XTRA_CRUFT_SH_LDFLAGS=
15 if test $have_msvc = yes; then 15 if test $have_msvc = yes; then
16 FLIBS="$FLIBS -lkernel32" 16 FLIBS="$FLIBS -lkernel32"
17 - XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def" 17 - XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def"
18 + XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def" 18 + XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def"
19 fi 19 fi
20 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) 20 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
21 21
22 diff -ur octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
23 --- octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-05-13 05:58:35 -0400
24 +++ octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-07-18 11:28:12 -0400
25 @@ -40,7 +40,9 @@
26 #include <stdio.h>
27 #include <stdarg.h>
28 #define WIN32_LEAN_AND_MEAN
29 +#if ! defined (_WIN32_WINNT) && ! defined (NTDDI_VERSION)
30 #define _WIN32_WINNT 0x0500
31 +#endif
32 #include <windows.h>
33 #include <cstring>
34 #include <csignal>
35 diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk 22 diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk
36 --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400 23 --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400
37 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-18 11:27:26 -0400 24 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-18 11:27:26 -0400
38 @@ -50,7 +50,7 @@ 25 @@ -50,7 +50,7 @@
39 qterminal_libqterminal_la_MOC += \ 26 qterminal_libqterminal_la_MOC += \
58 @QT_CPPFLAGS@ \ 45 @QT_CPPFLAGS@ \
59 diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am 46 diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am
60 --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400 47 --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400
61 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-18 11:27:26 -0400 48 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-18 11:27:26 -0400
62 @@ -185,6 +185,7 @@ 49 @@ -185,6 +185,7 @@
63 interpfcn/libinterpfcn.la \
64 corefcn/libcorefcn.la \ 50 corefcn/libcorefcn.la \
51 corefcn/libtex_parser.la \
65 $(top_builddir)/liboctave/liboctave.la \ 52 $(top_builddir)/liboctave/liboctave.la \
66 + $(top_builddir)/libgnu/libgnu.la \ 53 + $(top_builddir)/libgnu/libgnu.la \
67 $(LIBOCTINTERP_LINK_DEPS) 54 $(LIBOCTINTERP_LINK_DEPS)
68 55
69 # Increment these as needed and according to the rules in the libtool manual: 56 # Increment these as needed and according to the rules in the libtool manual:
244 - printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n", 231 - printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n",
245 + printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libgnu/libgnu.la %s $(OCT_LINK_DEPS)\n", 232 + printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libgnu/libgnu.la %s $(OCT_LINK_DEPS)\n",
246 basename, libraries[i]); 233 basename, libraries[i]);
247 } 234 }
248 } 235 }
249 diff -ur octave-3.7.5-orig/libinterp/interpfcn/graphics.cc octave-3.7.5/libinterp/interpfcn/graphics.cc 236 diff -ur octave-3.7.5-orig/libinterp/corefcn/graphics.cc octave-3.7.5/libinterp/corefcn/graphics.cc
250 --- octave-3.7.5-orig/libinterp/interpfcn/graphics.cc 2013-04-16 11:26:09 -0400 237 --- octave-3.7.5-orig/libinterp/corefcn/graphics.cc 2013-04-16 11:26:09 -0400
251 +++ octave-3.7.5/libinterp/interpfcn/graphics.cc 2013-07-18 11:27:26 -0400 238 +++ octave-3.7.5/libinterp/corefcn/graphics.cc 2013-07-18 11:27:26 -0400
252 @@ -10304,7 +10304,11 @@ 239 @@ -10304,7 +10304,11 @@
253 break; 240 break;
254 } 241 }
255 242
256 +#if defined (WIN32) && ! defined (__CYGWIN__) 243 +#if defined (WIN32) && ! defined (__CYGWIN__)