Mercurial > mxe-octave

changeset 3110:39997b7399e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add --with-our-malloc option to fftw src/fftw.mk: --with-our-malloc option added to configure, when not compiling for msvc.
author John Donoghue <john.donoghue@ieee.org>
date Sat, 29 Jun 2013 22:40:33 -0400
parents 98e1ed7ae70b
children 50135b4423ec
files src/fftw.mk
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/fftw.mk	Sat Jun 29 14:56:27 2013 -0400
+++ b/src/fftw.mk	Sat Jun 29 22:40:33 2013 -0400
@@ -13,6 +13,7 @@
     $(PKG)_HAVE_LONG_DOUBLE := false
 else
     $(PKG)_HAVE_LONG_DOUBLE := true
+    $(PKG)_CONFIG_OPTS := --with-our-malloc
 endif
 
 define $(PKG)_UPDATE
@@ -31,6 +32,7 @@
         --prefix='$(HOST_PREFIX)' \
         --enable-threads \
         --enable-sse2 \
+        $($(PKG)_CONFIG_OPTS) \
         --enable-double && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
@@ -43,6 +45,7 @@
             --prefix='$(HOST_PREFIX)' \
             --enable-threads \
             --enable-sse2 \
+            $($(PKG)_CONFIG_OPTS) \
             --enable-long-double && $(CONFIGURE_POST_HOOK) ; \
         $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ; \
         $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ; \
@@ -55,6 +58,7 @@
         --prefix='$(HOST_PREFIX)' \
         --enable-threads \
         --enable-sse2 \
+        $($(PKG)_CONFIG_OPTS) \
         --enable-float && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=