Mercurial > octave

changeset 30507:07ac55628691

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 Dec 2021 21:33:01 +0100
parents cd5836f814b8 (current diff) f79deeded5d3 (diff)
children 6ffa6dbbf42a
files configure.ac
diffstat 3 files changed, 21 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/mk-octave-config-h.sh	Fri Dec 17 19:41:48 2021 +0100
+++ b/build-aux/mk-octave-config-h.sh	Fri Dec 17 21:33:01 2021 +0100
@@ -181,6 +181,13 @@
 #    define octave_unused_parameter(param) (void) param;
 #  endif
 
+/* Defined to 1 if Octave libraries were built with visibility flags */
+EOF
+
+$SED -n 's/#\(\(undef\|define\) OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS.*$\)/#  \1/p' $config_h_file
+
+cat << EOF
+
 #  if defined (OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS)
 #    if defined (_WIN32) || defined (__CYGWIN__)
 #      if defined (__GNUC__)
--- a/configure.ac	Fri Dec 17 19:41:48 2021 +0100
+++ b/configure.ac	Fri Dec 17 21:33:01 2021 +0100
@@ -2656,10 +2656,17 @@
      *) AC_MSG_ERROR([bad value $enableval for --enable-lib-visibility-flags]) ;;
    esac])
 
-if test $ENABLE_LIB_VISIBILITY_FLAGS = yes && test $HAVE_VISIBILITY = 0; then
-  AC_MSG_NOTICE([cannot build with visibility flags on this platform])
-  ENABLE_LIB_VISIBILITY_FLAGS=no
-fi
+case $host_os in
+  msdosmsvc | mingw* | cygwin*)
+    # Assume that symbol export is working on that platform
+  ;;
+  *)
+    if test $ENABLE_LIB_VISIBILITY_FLAGS = yes && test $HAVE_VISIBILITY = 0; then
+      AC_MSG_NOTICE([cannot build with visibility flags on this platform])
+      ENABLE_LIB_VISIBILITY_FLAGS=no
+    fi
+  ;;
+esac
 
 if test $ENABLE_LIB_VISIBILITY_FLAGS = yes; then
   AC_DEFINE(OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS, 1,
--- a/liboctave/util/oct-sort.h	Fri Dec 17 19:41:48 2021 +0100
+++ b/liboctave/util/oct-sort.h	Fri Dec 17 21:33:01 2021 +0100
@@ -98,6 +98,7 @@
 
 template <typename T>
 class
+OCTARRAY_API
 octave_sort
 {
 public:
@@ -347,10 +348,12 @@
 
 template <typename T>
 class
+OCTARRAY_API
 vec_index
 {
 public:
   T m_vec;
   octave_idx_type m_indx;
 };
+
 #endif