Mercurial > mxe-octave

changeset 5653:d52c26fc0820

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qhull: Build and install non-reentrant libqhull (bug #60016). * src/qhull.mk: The non-reentrant Qhull library `libqhull` is no longer built with the default build target. Build and install it manually.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 06 Feb 2021 16:51:10 +0100
parents eccf230ad6c1
children 909478332316
files src/qhull.mk
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qhull.mk	Sun Feb 07 10:52:22 2021 +0100
+++ b/src/qhull.mk	Sat Feb 06 16:51:10 2021 +0100
@@ -23,6 +23,9 @@
     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 \
@@ -33,5 +36,12 @@
         -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