Mercurial > mxe-octave

diff src/qhull.mk @ 4874:c4e929fb081d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qhull to 2015.2 * dist-files.mk: remove ref to qhull-2-fixes.patch * src/qhull-2-fixes.patch: removed * src/qhull-1-fixes.patch: update patch * src/qhull.mk: update version,checksum, update and build rule
author John Donoghue
date Tue, 30 Oct 2018 16:29:41 -0400
parents 0641ed0cbc53
children c105cddd23d5
line wrap: on
line diff
--- a/src/qhull.mk	Tue Oct 30 15:24:43 2018 -0400
+++ b/src/qhull.mk	Tue Oct 30 16:29:41 2018 -0400
@@ -3,30 +3,32 @@
 
 PKG             := qhull
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2009.1
-$(PKG)_CHECKSUM := 108d59efa60b2ebaf94b121414c8f8b7b76a7409
+$(PKG)_VERSION  := 2015.2
+$(PKG)_CHECKSUM := 0dd03e0232124c81c696fac60db71ca7327eb16e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := qhull-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://download.savannah.gnu.org/releases/qhull/$($(PKG)_FILE)
+$(PKG)_URL      := https://github.com/qhull/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     :=
 
-ifeq ($(ENABLE_QHULL_NO_STRICT_ALIASING_FLAG),yes)
-  $(PKG)_CONFIGURE_CFLAGS := CFLAGS="-O2 -g -fno-strict-aliasing"
+$(PKG)_CMAKE_OPTS :=
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" 
+  endif
 endif
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package qhull.' >&2;
-    echo $(qhull_VERSION)
+    $(WGET) -q -O- 'https://github.com/qhull/qhull/tags' | \
+    $(SED) -n 's|.*releases/tag/\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && aclocal && libtoolize && autoreconf
-    mkdir '$(1)/.build'
-    cd '$(1)/.build' && '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        $($(PKG)_CONFIGURE_CFLAGS) \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' $(MXE_DISABLE_DOCS)
+    mkdir '$(1)/../.build'
+    cd '$(1)/../.build' && cmake \
+        $($(PKG)_CMAKE_OPTS) \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'  \
+        ../$($(PKG)_SUBDIR)
+    make -C $(1)/../.build -j $(JOBS) 
+    make -C $(1)/../.build -j 1 install DESTDIR=$(3)
 endef