Mercurial > mxe-octave

changeset 6543:5c46967d43cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QHull: No longer build or install non-reentrant version of the library (bug #60016). * src/qhull.mk: The non-reentrant version of QHull is no longer supported upstream and is no longer used since Octave 7. Remove the corresponding parts of the build rule.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 26 Nov 2022 21:09:08 +0100
parents 66dc175767da
children 5409aa8dd237
files src/qhull.mk
diffstat 1 files changed, 0 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/qhull.mk	Tue Nov 22 07:34:57 2022 -0500
+++ b/src/qhull.mk	Sat Nov 26 21:09:08 2022 +0100
@@ -23,9 +23,6 @@
     tail -1
 endef
 
-# FIXME: Building and installing the deprecated target "libqhull" can be
-#        removed when Octave switches to using "libqhull_r" (see bug #60016).
-
 define $(PKG)_BUILD
     mkdir '$(1)/../.build'
     cd '$(1)/../.build' && cmake \
@@ -36,12 +33,5 @@
         -DDOC_INSTALL_DIR='$(1)' \
         ../$($(PKG)_SUBDIR)
     make -C $(1)/../.build -j $(JOBS) 
-    make -C $(1)/../.build libqhull -j $(JOBS) 
     make -C $(1)/../.build -j 1 install DESTDIR=$(3)
-    if [ x$(MXE_WINDOWS_BUILD) == xyes ]; then \
-      $(INSTALL) '$(1)/../.build/libqhull.dll.a' '$(3)$(HOST_LIBDIR)/'; \
-      $(INSTALL) '$(1)/../.build/libqhull.dll' '$(3)$(HOST_BINDIR)/'; \
-    else \
-      $(INSTALL) $(1)/../.build/libqhull.so* '$(3)$(HOST_LIBDIR)/'; \
-    fi
 endef