changeset 3071:152e3e693568

Include qhull as a dependency of Octave
author John W. Eaton <jwe@octave.org>
date Thu, 29 Nov 2012 12:22:19 -0500
parents 426bca8b039e
children 848118c648ae
files index.html src/octave.mk src/qhull-1-fixes.patch src/qhull.mk
diffstat 4 files changed, 51 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/index.html
+++ b/index.html
@@ -1819,6 +1819,11 @@
         <td id="qdbm-website"><a href="http://fallabs.com/qdbm/">QDBM</a></td>
     </tr>
     <tr>
+        <td id="qhull-package">qhull</td>
+        <td id="qhull-version">2009.1</td>
+        <td id="qhull-website"><a href="http://qjson.sourceforge.net/">QHull</a></td>
+    </tr>
+    <tr>
         <td id="qjson-package">qjson</td>
         <td id="qjson-version">0.7.1</td>
         <td id="qjson-website"><a href="http://qjson.sourceforge.net/">QJson</a></td>
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fltk gcc glpk graphicsmagick lapack pcre qrupdate readline suitesparse zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
new file mode 100644
--- /dev/null
+++ b/src/qhull-1-fixes.patch
@@ -0,0 +1,17 @@
+From the Debian QHull package.
+
+Access globals via a pointer to allocated memory.
+
+ -- Rafael Laboissiere <rafael@debian.org>  Wed, 25 Sep 2002 10:39:30 +0200
+
+--- qhull-orig/src/user.h	2002-04-29 11:01:46.000000000 +0200
++++ qhull/src/user.h	2004-02-02 11:04:47.000000000 +0100
+@@ -509,7 +509,7 @@
+   see:
+     user_eg.c for an example
+ */
+-#define qh_QHpointer 0
++#define qh_QHpointer 1
+ #if 0  /* sample code */
+     qhT *oldqhA, *oldqhB;
+ 
new file mode 100644
--- /dev/null
+++ b/src/qhull.mk
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := qhull
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 108d59efa60b2ebaf94b121414c8f8b7b76a7409
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := qhull-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://download.savannah.gnu.org/releases/qhull/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package qhull.' >&2;
+    echo $(qhull_VERSION)
+endef
+
+define $(PKG)_BUILD
+    # build GCC and support libraries
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && '$(1)/configure' \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        $(ENABLE_SHARED_DISABLE_STATIC) \
+        --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
+
+    rm -f $(PREFIX)/$(TARGET)/lib/libqhull.la
+endef