Mercurial > mxe-octave

comparison src/octave.mk @ 3153:d1231b6c2b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make OCTAVE_CONFIGURE_POST_HOOK set indepenant build type * src/octave.mk: $(PKG)_CONFIGURE_POST_HOOK always set to CONFIGURE_POST_HOOK value, independant to build system.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 18 Jul 2013 22:54:19 -0400
parents 433d1bb3cafb
children 1080856f48c4
comparison
equal deleted inserted replaced
3152:4ce61d3172f0 3153:d1231b6c2b34
17 $(PKG)_DEPS += openblas 17 $(PKG)_DEPS += openblas
18 $(PKG)_BLAS_OPTION := --with-blas=openblas 18 $(PKG)_BLAS_OPTION := --with-blas=openblas
19 else 19 else
20 $(PKG)_DEPS += blas 20 $(PKG)_DEPS += blas
21 endif 21 endif
22
23 $(PKG)_CONFIGURE_POST_HOOK := $(CONFIGURE_POST_HOOK) -x
22 24
23 ifeq ($(MXE_NATIVE_BUILD),yes) 25 ifeq ($(MXE_NATIVE_BUILD),yes)
24 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) 26 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
25 ifeq ($(ENABLE_64),yes) 27 ifeq ($(ENABLE_64),yes)
26 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 28 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64
43 # because it uses intrinsics (with -O2 flag) and bump on the fake 45 # because it uses intrinsics (with -O2 flag) and bump on the fake
44 # "char FUNC()" forward declaration. 46 # "char FUNC()" forward declaration.
45 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ 47 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
46 --enable-atomic-refcount \ 48 --enable-atomic-refcount \
47 ac_cv_func_pow=yes ac_cv_func_sqrt=yes 49 ac_cv_func_pow=yes ac_cv_func_sqrt=yes
48 $(PKG)_CONFIGURE_POST_HOOK := $(CONFIGURE_POST_HOOK) -x
49 else 50 else
50 $(PKG)_PREFIX := '$(HOST_PREFIX)' 51 $(PKG)_PREFIX := '$(HOST_PREFIX)'
51 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ 52 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
52 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' 53 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
53 endif 54 endif