Mercurial > hg > mxe-octave-anirudha

changeset 3211:9bedb9046700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[Darwin] src/octave.mk: Specify appropriate LDFLAGS for Max OS X builds Add header padding to allow changing of dynamic library paths recorded in output files Remove obsolete LDFLAG -rpath-link from LDFLAGS
author Anirudha Bose <ani07nov@gmail.com>
date Thu, 19 Sep 2013 23:51:01 +0530
parents 1d0fd132afa6
children 5fc65ca6f7c9
files src/octave.mk
diffstat 1 files changed, 2 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -59,45 +59,15 @@
 endif
 
 ifeq ($(MXE_SYSTEM), darwin)
+  $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+    LDFLAGS='-Wl,-headerpad_max_install_names,-L$(HOST_LIBDIR)'
   $(PKG)_DARWIN_EXTRA_CONFIG_OPTIONS := \
-    --with-umfpack-includedir='$(HOST_INCDIR)' \
-    --with-umfpack-libdir='$(HOST_LIBDIR)' \
-    --with-arpack-includedir='$(HOST_INCDIR)' \
-    --with-arpack-libdir='$(HOST_LIBDIR)' \
-    --with-amd-includedir='$(HOST_INCDIR)' \
-    --with-amd-libdir='$(HOST_LIBDIR)' \
-    --with-camd-includedir='$(HOST_INCDIR)' \
-    --with-camd-libdir='$(HOST_LIBDIR)' \
-    --with-cholmod-includedir='$(HOST_INCDIR)' \
-    --with-cholmod-libdir='$(HOST_LIBDIR)' \
-    --with-colamd-includedir='$(HOST_INCDIR)' \
-    --with-colamd-libdir='$(HOST_LIBDIR)' \
-    --with-ccolamd-includedir='$(HOST_INCDIR)' \
-    --with-ccolamd-libdir='$(HOST_LIBDIR)' \
-    --with-cxsparse-includedir='$(HOST_INCDIR)' \
-    --with-cxsparse-libdir='$(HOST_LIBDIR)' \
-    --with-qhull-includedir='$(HOST_INCDIR)' \
-    --with-qhull-libdir='$(HOST_LIBDIR)' \
-    --with-hdf5-includedir='$(HOST_INCDIR)' \
-    --with-hdf5-libdir='$(HOST_LIBDIR)' \
-    --with-glpk-includedir='$(HOST_INCDIR)' \
-    --with-glpk-libdir='$(HOST_LIBDIR)' \
-    --with-fftw3-includedir='$(HOST_INCDIR)' \
-    --with-fftw3-libdir='$(HOST_LIBDIR)' \
-    --with-fftw3f-includedir='$(HOST_INCDIR)' \
-    --with-fftw3f-libdir='$(HOST_LIBDIR)' \
-    --enable-fftw-threads \
-    --with-qrupdate-includedir='$(HOST_INCDIR)' \
-    --with-qrupdate-libdir='$(HOST_LIBDIR)' \
-    --with-arpack-includedir='$(HOST_INCDIR)' \
-    --with-arpack-libdir='$(HOST_LIBDIR)' \
     F77=$(MXE_F77)
   ifeq ($(ENABLE_JIT), yes)
     $(PKG)_DARWIN_EXTRA_CONFIG_OPTIONS += LLVM_CONFIG=`find /opt/local/libexec -name llvm-config 2>/dev/null | head -n 1`
   endif
 endif
 
-
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
     echo $(octave_VERSION)