Mercurial > mxe-octave

changeset 3652:7af3dec1ab50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
link readline with ncurses for native builds
author John W. Eaton <jwe@octave.org>
date Tue, 08 Jul 2014 10:03:56 -0400
parents 8d3f34484fda
children 3085b1b955dd
files src/readline.mk
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/readline.mk	Tue Jul 08 10:03:18 2014 -0400
+++ b/src/readline.mk	Tue Jul 08 10:03:56 2014 -0400
@@ -13,6 +13,10 @@
   $(PKG)_TERMCAP_LIB := termcap
 else
   $(PKG)_TERMCAP_LIB := ncurses
+  ifeq ($(MXE_NATIVE_BUILD),yes)
+    $(PKG)_CONFIGURE_OPTIONS := --with-curses bash_cv_termcap_lib="-lncurses"
+    $(PKG)_MAKE_OPTIONS := SHLIB_LIBS="-lncurses"
+  endif
 endif
 
 $(PKG)_DEPS := $($(PKG)_TERMCAP_LIB)
@@ -35,8 +39,9 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
+        $($(PKG)_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --enable-multibyte \
         --without-purify
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_MAKE_OPTIONS) install DESTDIR='$(3)'
 endef