Mercurial > mxe-octave
changeset 3887:768c5d4c5b4e
new configure option: --enable-qhull-no-strict-aliasing-flag
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 10 Apr 2015 13:50:50 -0400 |
| parents | 588d2942b538 |
| children | e9f98ac0f81d |
| files | Makefile.in configure.ac src/qhull.mk |
| diffstat | 3 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Fri Apr 10 12:11:50 2015 -0400 +++ b/Makefile.in Fri Apr 10 13:50:50 2015 -0400 @@ -75,6 +75,9 @@ USE_PIC_FLAG := @USE_PIC_FLAG@ +# Compile Qhull with -fno-strict-aliasing flag. +ENABLE_QHULL_NO_STRICT_ALIASING_FLAG := @ENABLE_QHULL_NO_STRICT_ALIASING_FLAG@ + # Attempt to build with support for Java. ENABLE_JAVA := @ENABLE_JAVA@
--- a/configure.ac Fri Apr 10 12:11:50 2015 -0400 +++ b/configure.ac Fri Apr 10 13:50:50 2015 -0400 @@ -157,6 +157,15 @@ [if test "$enableval" = no; then ENABLE_OPENBLAS=no; fi], []) AC_SUBST(ENABLE_OPENBLAS) +ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=no +AC_ARG_ENABLE([qhull-no-strict-aliasing-flag], + [AS_HELP_STRING([--enable-qhull-no-strict-aliasing-flag], + [Compile Qhull with -fno-strict-aliasing flag])], + [if test "$enableval" = yes; then + ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=yes; + fi], []) +AC_SUBST(ENABLE_QHULL_NO_STRICT_ALIASING_FLAG) + ENABLE_OCTAVE=stable AC_ARG_ENABLE([octave], [AS_HELP_STRING([--enable-octave=stable],
--- a/src/qhull.mk Fri Apr 10 12:11:50 2015 -0400 +++ b/src/qhull.mk Fri Apr 10 13:50:50 2015 -0400 @@ -10,6 +10,10 @@ $(PKG)_URL := http://download.savannah.gnu.org/releases/qhull/$($(PKG)_FILE) $(PKG)_DEPS := +ifeq ($(ENABLE_QHULL_NO_STRICT_ALIASING_FLAG),yes) + $(PKG)_CONFIGURE_CFLAGS := CFLAGS="-O2 -g -fno-strict-aliasing" +endif + define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package qhull.' >&2; echo $(qhull_VERSION) @@ -20,6 +24,7 @@ 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)