Mercurial > mxe-octave

changeset 3341:b251f4358147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] auto-export gnulib symbols from liboctave. * src/octave.mk ($(PKG)_CONFIGURE_POST_HOOK): Remove variable, use regular CONFIGURE_POST_HOOK instead. * src /msvc-octave-1.patch: Don't link anything but liboctave against libgnu.la.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 30 Nov 2013 21:27:29 -0500
parents 098ca5276ab8
children 5e9dc7f88328
files src/msvc-octave-1.patch src/octave.mk
diffstat 2 files changed, 54 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/src/msvc-octave-1.patch	Fri Nov 29 18:50:20 2013 -0500
+++ b/src/msvc-octave-1.patch	Sat Nov 30 21:27:29 2013 -0500
@@ -1,16 +1,16 @@
-diff -ur octave-3.7.5-orig/configure.ac octave-3.7.5/configure.ac
---- octave-3.7.5-orig/configure.ac	2013-05-14 03:12:10 -0400
-+++ octave-3.7.5/configure.ac	2013-07-18 11:27:26 -0400
-@@ -752,7 +752,7 @@
+diff -ur octave-3.7.7-orig/configure.ac octave-3.7.7/configure.ac
+--- octave-3.7.7-orig/configure.ac	2013-09-23 13:50:11 -0400
++++ octave-3.7.7/configure.ac	2013-11-30 11:00:38 -0500
+@@ -757,7 +757,7 @@
      dnl Use -isystem so we don't get warnings from llvm headers
      LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
      LLVM_CXXFLAGS=
 -    LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
 +    LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`"
-
+ 
  
      LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
-@@ -1186,7 +1186,7 @@
+@@ -1228,7 +1228,7 @@
  XTRA_CRUFT_SH_LDFLAGS=
  if test $have_msvc = yes; then
    FLIBS="$FLIBS -lkernel32"
@@ -19,9 +19,9 @@
  fi
  AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
  
-diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk
---- octave-3.7.5-orig/libgui/qterminal-module.mk	2013-05-12 15:01:12 -0400
-+++ octave-3.7.5/libgui/qterminal-module.mk	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/libgui/qterminal-module.mk octave-3.7.7/libgui/qterminal-module.mk
+--- octave-3.7.7-orig/libgui/qterminal-module.mk	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/libgui/qterminal-module.mk	2013-11-30 11:00:38 -0500
 @@ -50,7 +50,7 @@
  qterminal_libqterminal_la_MOC += \
    qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
@@ -31,10 +31,10 @@
  
  # This flag is required to let MOC know about Q_OS_WIN32.
  MOC_CPPFLAGS += -DQ_OS_WIN32
-diff -ur octave-3.7.5-orig/libgui/src/module.mk octave-3.7.5/libgui/src/module.mk
---- octave-3.7.5-orig/libgui/src/module.mk	2013-05-12 17:21:10 -0400
-+++ octave-3.7.5/libgui/src/module.mk	2013-07-18 11:27:26 -0400
-@@ -152,7 +152,7 @@
+diff -ur octave-3.7.7-orig/libgui/src/module.mk octave-3.7.7/libgui/src/module.mk
+--- octave-3.7.7-orig/libgui/src/module.mk	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/libgui/src/module.mk	2013-11-30 11:00:38 -0500
+@@ -161,7 +161,7 @@
  
  nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
  
@@ -43,20 +43,9 @@
    $(AM_CPPFLAGS) \
    @OCTGUI_DLL_DEFS@ \
    @QT_CPPFLAGS@ \
-diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am
---- octave-3.7.5-orig/libinterp/Makefile.am	2013-04-16 11:26:09 -0400
-+++ octave-3.7.5/libinterp/Makefile.am	2013-07-18 11:27:26 -0400
-@@ -185,6 +185,7 @@
-   corefcn/libcorefcn.la \
-   corefcn/libtex_parser.la \
-   $(top_builddir)/liboctave/liboctave.la \
-+  $(top_builddir)/libgnu/libgnu.la \
-   $(LIBOCTINTERP_LINK_DEPS)
- 
- # Increment these as needed and according to the rules in the libtool manual:
-diff -ur octave-3.7.5-orig/libinterp/corefcn/gcd.cc octave-3.7.5/libinterp/corefcn/gcd.cc
---- octave-3.7.5-orig/libinterp/corefcn/gcd.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/libinterp/corefcn/gcd.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/libinterp/corefcn/gcd.cc octave-3.7.7/libinterp/corefcn/gcd.cc
+--- octave-3.7.7-orig/libinterp/corefcn/gcd.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/libinterp/corefcn/gcd.cc	2013-11-30 11:00:38 -0500
 @@ -74,7 +74,7 @@
  
  template <typename FP>
@@ -221,22 +210,10 @@
        break;
  
      default:
-diff -ur octave-3.7.5-orig/libinterp/dldfcn/config-module.awk octave-3.7.5/libinterp/dldfcn/config-module.awk
---- octave-3.7.5-orig/libinterp/dldfcn/config-module.awk	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/libinterp/dldfcn/config-module.awk	2013-07-18 11:27:26 -0400
-@@ -71,7 +71,7 @@
-       }
-     printf ("dldfcn_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n",
-             basename, ldflags[i]);
--    printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n",
-+    printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libgnu/libgnu.la %s $(OCT_LINK_DEPS)\n",
-             basename, libraries[i]);
-   }
- }
-diff -ur octave-3.7.5-orig/libinterp/corefcn/graphics.cc octave-3.7.5/libinterp/corefcn/graphics.cc
---- octave-3.7.5-orig/libinterp/corefcn/graphics.cc	2013-04-16 11:26:09 -0400
-+++ octave-3.7.5/libinterp/corefcn/graphics.cc	2013-07-18 11:27:26 -0400
-@@ -10304,7 +10304,11 @@
+diff -ur octave-3.7.7-orig/libinterp/corefcn/graphics.cc octave-3.7.7/libinterp/corefcn/graphics.cc
+--- octave-3.7.7-orig/libinterp/corefcn/graphics.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/libinterp/corefcn/graphics.cc	2013-11-30 11:00:38 -0500
+@@ -10441,7 +10441,11 @@
                      break;
                  }
  
@@ -248,9 +225,9 @@
  
                OCTAVE_QUIT;
  
-diff -ur octave-3.7.5-orig/liboctave/array/CColVector.cc octave-3.7.5/liboctave/array/CColVector.cc
---- octave-3.7.5-orig/liboctave/array/CColVector.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/array/CColVector.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/CColVector.cc octave-3.7.7/liboctave/array/CColVector.cc
+--- octave-3.7.7-orig/liboctave/array/CColVector.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/CColVector.cc	2013-11-30 11:00:38 -0500
 @@ -236,13 +236,13 @@
  ColumnVector
  ComplexColumnVector::abs (void) const
@@ -267,9 +244,9 @@
  }
  
  // resize is the destructive equivalent for this one
-diff -ur octave-3.7.5-orig/liboctave/array/CMatrix.cc octave-3.7.5/liboctave/array/CMatrix.cc
---- octave-3.7.5-orig/liboctave/array/CMatrix.cc	2013-04-16 11:26:09 -0400
-+++ octave-3.7.5/liboctave/array/CMatrix.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/CMatrix.cc octave-3.7.7/liboctave/array/CMatrix.cc
+--- octave-3.7.7-orig/liboctave/array/CMatrix.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/CMatrix.cc	2013-11-30 11:00:38 -0500
 @@ -921,7 +921,7 @@
  ComplexMatrix
  conj (const ComplexMatrix& a)
@@ -288,9 +265,9 @@
  }
  
  ComplexMatrix
-diff -ur octave-3.7.5-orig/liboctave/array/CNDArray.cc octave-3.7.5/liboctave/array/CNDArray.cc
---- octave-3.7.5-orig/liboctave/array/CNDArray.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/array/CNDArray.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/CNDArray.cc octave-3.7.7/liboctave/array/CNDArray.cc
+--- octave-3.7.7-orig/liboctave/array/CNDArray.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/CNDArray.cc	2013-11-30 11:00:38 -0500
 @@ -720,31 +720,31 @@
  NDArray
  ComplexNDArray::abs (void) const
@@ -328,9 +305,9 @@
  }
  
  ComplexNDArray&
-diff -ur octave-3.7.5-orig/liboctave/array/CRowVector.cc octave-3.7.5/liboctave/array/CRowVector.cc
---- octave-3.7.5-orig/liboctave/array/CRowVector.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/array/CRowVector.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/CRowVector.cc octave-3.7.7/liboctave/array/CRowVector.cc
+--- octave-3.7.7-orig/liboctave/array/CRowVector.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/CRowVector.cc	2013-11-30 11:00:38 -0500
 @@ -234,7 +234,7 @@
  ComplexRowVector
  conj (const ComplexRowVector& a)
@@ -340,9 +317,9 @@
  }
  
  // resize is the destructive equivalent for this one
-diff -ur octave-3.7.5-orig/liboctave/array/fCColVector.cc octave-3.7.5/liboctave/array/fCColVector.cc
---- octave-3.7.5-orig/liboctave/array/fCColVector.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/array/fCColVector.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/fCColVector.cc octave-3.7.7/liboctave/array/fCColVector.cc
+--- octave-3.7.7-orig/liboctave/array/fCColVector.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/fCColVector.cc	2013-11-30 11:00:38 -0500
 @@ -236,13 +236,13 @@
  FloatColumnVector
  FloatComplexColumnVector::abs (void) const
@@ -359,9 +336,9 @@
  }
  
  // resize is the destructive equivalent for this one
-diff -ur octave-3.7.5-orig/liboctave/array/fCMatrix.cc octave-3.7.5/liboctave/array/fCMatrix.cc
---- octave-3.7.5-orig/liboctave/array/fCMatrix.cc	2013-04-16 11:26:09 -0400
-+++ octave-3.7.5/liboctave/array/fCMatrix.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/fCMatrix.cc octave-3.7.7/liboctave/array/fCMatrix.cc
+--- octave-3.7.7-orig/liboctave/array/fCMatrix.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/fCMatrix.cc	2013-11-30 11:00:38 -0500
 @@ -923,7 +923,7 @@
  FloatComplexMatrix
  conj (const FloatComplexMatrix& a)
@@ -380,9 +357,9 @@
  }
  
  FloatComplexMatrix
-diff -ur octave-3.7.5-orig/liboctave/array/fCNDArray.cc octave-3.7.5/liboctave/array/fCNDArray.cc
---- octave-3.7.5-orig/liboctave/array/fCNDArray.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/array/fCNDArray.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/fCNDArray.cc octave-3.7.7/liboctave/array/fCNDArray.cc
+--- octave-3.7.7-orig/liboctave/array/fCNDArray.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/fCNDArray.cc	2013-11-30 11:00:38 -0500
 @@ -717,31 +717,31 @@
  FloatNDArray
  FloatComplexNDArray::abs (void) const
@@ -420,9 +397,9 @@
  }
  
  FloatComplexNDArray&
-diff -ur octave-3.7.5-orig/liboctave/array/fCRowVector.cc octave-3.7.5/liboctave/array/fCRowVector.cc
---- octave-3.7.5-orig/liboctave/array/fCRowVector.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/array/fCRowVector.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/array/fCRowVector.cc octave-3.7.7/liboctave/array/fCRowVector.cc
+--- octave-3.7.7-orig/liboctave/array/fCRowVector.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/array/fCRowVector.cc	2013-11-30 11:00:38 -0500
 @@ -234,7 +234,7 @@
  FloatComplexRowVector
  conj (const FloatComplexRowVector& a)
@@ -432,9 +409,9 @@
  }
  
  // resize is the destructive equivalent for this one
-diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.cc octave-3.7.5/liboctave/numeric/dbleQR.cc
---- octave-3.7.5-orig/liboctave/numeric/dbleQR.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/numeric/dbleQR.cc	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/numeric/dbleQR.cc octave-3.7.7/liboctave/numeric/dbleQR.cc
+--- octave-3.7.7-orig/liboctave/numeric/dbleQR.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/numeric/dbleQR.cc	2013-11-30 11:00:38 -0500
 @@ -95,7 +95,9 @@
  #endif
  }
@@ -446,9 +423,9 @@
  
  QR::QR (const Matrix& a, qr_type_t qr_type)
  {
-diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.h octave-3.7.5/liboctave/numeric/dbleQR.h
---- octave-3.7.5-orig/liboctave/numeric/dbleQR.h	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/numeric/dbleQR.h	2013-07-18 11:27:26 -0400
+diff -ur octave-3.7.7-orig/liboctave/numeric/dbleQR.h octave-3.7.7/liboctave/numeric/dbleQR.h
+--- octave-3.7.7-orig/liboctave/numeric/dbleQR.h	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/numeric/dbleQR.h	2013-11-30 11:00:38 -0500
 @@ -40,9 +40,9 @@
    // Import them here to allow the QR:: prefix.
    typedef qr_type_t type;
@@ -462,9 +439,9 @@
  
    QR (void) : base_qr<Matrix> () { }
  
-diff -ur octave-3.7.5-orig/liboctave/operators/mx-inlines.cc octave-3.7.5/liboctave/operators/mx-inlines.cc
---- octave-3.7.5-orig/liboctave/operators/mx-inlines.cc	2013-02-16 18:52:27 -0500
-+++ octave-3.7.5/liboctave/operators/mx-inlines.cc	2013-07-18 11:27:27 -0400
+diff -ur octave-3.7.7-orig/liboctave/operators/mx-inlines.cc octave-3.7.7/liboctave/operators/mx-inlines.cc
+--- octave-3.7.7-orig/liboctave/operators/mx-inlines.cc	2013-09-23 13:49:55 -0400
++++ octave-3.7.7/liboctave/operators/mx-inlines.cc	2013-11-30 11:00:38 -0500
 @@ -316,7 +316,7 @@
  { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); }
  
@@ -486,16 +463,3 @@
  }
  
  template <class R>
-diff -ur octave-3.7.5-orig/src/Makefile.am octave-3.7.5/src/Makefile.am
---- octave-3.7.5-orig/src/Makefile.am	2013-04-16 11:26:10 -0400
-+++ octave-3.7.5/src/Makefile.am	2013-07-18 11:27:27 -0400
-@@ -49,7 +49,8 @@
- 
- OCTAVE_CORE_LIBS = \
-   $(top_builddir)/libinterp/liboctinterp.la \
--  $(top_builddir)/liboctave/liboctave.la
-+  $(top_builddir)/liboctave/liboctave.la \
-+  $(top_builddir)/libgnu/libgnu.la
- 
- include ../libgui/link-deps.mk
- 
--- a/src/octave.mk	Fri Nov 29 18:50:20 2013 -0500
+++ b/src/octave.mk	Sat Nov 30 21:27:29 2013 -0500
@@ -29,8 +29,6 @@
   $(PKG)_DEPS += blas
 endif
 
-$(PKG)_CONFIGURE_POST_HOOK := $(CONFIGURE_POST_HOOK) -x
-
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
@@ -85,7 +83,7 @@
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
         PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
-        && $($(PKG)_CONFIGURE_POST_HOOK)
+        && $(CONFIGURE_POST_HOOK)
 
     ## We want both of these install steps so that we install in the
     ## location set by the configure --prefix option, and the other