Mercurial > mxe-octave

comparison src/fftw.mk @ 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 3663f6300abf
children f283b410a60f
comparison
equal deleted inserted replaced
3109:98e1ed7ae70b 3110:39997b7399e5
11 11
12 ifeq ($(MXE_SYSTEM),msvc) 12 ifeq ($(MXE_SYSTEM),msvc)
13 $(PKG)_HAVE_LONG_DOUBLE := false 13 $(PKG)_HAVE_LONG_DOUBLE := false
14 else 14 else
15 $(PKG)_HAVE_LONG_DOUBLE := true 15 $(PKG)_HAVE_LONG_DOUBLE := true
16 $(PKG)_CONFIG_OPTS := --with-our-malloc
16 endif 17 endif
17 18
18 define $(PKG)_UPDATE 19 define $(PKG)_UPDATE
19 $(WGET) -q -O- 'http://www.fftw.org/download.html' | \ 20 $(WGET) -q -O- 'http://www.fftw.org/download.html' | \
20 $(SED) -n 's,.*fftw-\([0-9][^>]*\)\.tar.*,\1,p' | \ 21 $(SED) -n 's,.*fftw-\([0-9][^>]*\)\.tar.*,\1,p' | \
29 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ 30 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
30 $(ENABLE_SHARED_OR_STATIC) \ 31 $(ENABLE_SHARED_OR_STATIC) \
31 --prefix='$(HOST_PREFIX)' \ 32 --prefix='$(HOST_PREFIX)' \
32 --enable-threads \ 33 --enable-threads \
33 --enable-sse2 \ 34 --enable-sse2 \
35 $($(PKG)_CONFIG_OPTS) \
34 --enable-double && $(CONFIGURE_POST_HOOK) 36 --enable-double && $(CONFIGURE_POST_HOOK)
35 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= 37 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
36 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= 38 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
37 39
38 if $($(PKG)_HAVE_LONG_DOUBLE); then \ 40 if $($(PKG)_HAVE_LONG_DOUBLE); then \
41 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ 43 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
42 $(ENABLE_SHARED_OR_STATIC) \ 44 $(ENABLE_SHARED_OR_STATIC) \
43 --prefix='$(HOST_PREFIX)' \ 45 --prefix='$(HOST_PREFIX)' \
44 --enable-threads \ 46 --enable-threads \
45 --enable-sse2 \ 47 --enable-sse2 \
48 $($(PKG)_CONFIG_OPTS) \
46 --enable-long-double && $(CONFIGURE_POST_HOOK) ; \ 49 --enable-long-double && $(CONFIGURE_POST_HOOK) ; \
47 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ; \ 50 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ; \
48 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ; \ 51 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ; \
49 fi 52 fi
50 53
53 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ 56 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
54 $(ENABLE_SHARED_OR_STATIC) \ 57 $(ENABLE_SHARED_OR_STATIC) \
55 --prefix='$(HOST_PREFIX)' \ 58 --prefix='$(HOST_PREFIX)' \
56 --enable-threads \ 59 --enable-threads \
57 --enable-sse2 \ 60 --enable-sse2 \
61 $($(PKG)_CONFIG_OPTS) \
58 --enable-float && $(CONFIGURE_POST_HOOK) 62 --enable-float && $(CONFIGURE_POST_HOOK)
59 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= 63 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
60 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= 64 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
61 endef 65 endef