Mercurial > mxe-octave

changeset 2904:1122ae1e98b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New rules for termcap package. readline: Depend on termcap instead of ncurses.
author John W. Eaton <jwe@octave.org>
date Wed, 05 Dec 2012 12:21:50 -0500
parents 41df214441e9
children 5a985098f4c9
files index.html src/readline.mk src/termcap-1-fixes.patch src/termcap.mk
diffstat 4 files changed, 51 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Tue Dec 04 18:00:41 2012 -0500
+++ b/index.html	Wed Dec 05 12:21:50 2012 -0500
@@ -1929,6 +1929,11 @@
         <td id="taglib-website"><a href="http://developer.kde.org/~wheeler/taglib.html">TagLib</a></td>
     </tr>
     <tr>
+        <td id="termcap-package">termcap</td>
+        <td id="termcap-version">1.3.1</td>
+        <td id="termcap-website"><a href="ftp://ftp.gnu.org/gnu/termcap/">GNU termcap</a></td>
+    </tr>
+    <tr>
         <td id="theora-package">theora</td>
         <td id="theora-version">1.1.1</td>
         <td id="theora-website"><a href="http://theora.org/">Theora</a></td>
--- a/src/readline.mk	Tue Dec 04 18:00:41 2012 -0500
+++ b/src/readline.mk	Wed Dec 05 12:21:50 2012 -0500
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := readline-$($(PKG)_VERSION)
 $(PKG)_FILE     := readline-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/readline/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc ncurses
+$(PKG)_DEPS     := gcc termcap
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://tiswww.case.edu/php/chet/readline/rltop.html' | \
@@ -24,7 +24,6 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-multibyte \
-        --without-purify \
-        --with-curses
+        --without-purify
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/termcap-1-fixes.patch	Wed Dec 05 12:21:50 2012 -0500
@@ -0,0 +1,11 @@
+--- a/Makefile.in	1995-08-16 20:54:29.000000000 -0400
++++ b/Makefile.in	2012-12-05 11:45:11.124478718 -0500
+@@ -75,8 +75,6 @@
+ 	$(INSTALL_DATA) libtermcap.a $(libdir)/libtermcap.a
+ 	-$(RANLIB) $(libdir)/libtermcap.a
+ 	cd $(srcdir); $(INSTALL_DATA) termcap.h $(includedir)/termcap.h
+-	-cd $(srcdir); test -z "$(oldincludedir)" || \
+-	  $(INSTALL_DATA) termcap.h $(oldincludedir)/termcap.h
+ 	cd $(srcdir); for f in termcap.info*; \
+ 	do $(INSTALL_DATA) $$f $(infodir)/$$f; done
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/termcap.mk	Wed Dec 05 12:21:50 2012 -0500
@@ -0,0 +1,33 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := termcap
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 42dd1e6beee04f336c884f96314f0c96cc2578be
+$(PKG)_SUBDIR   := termcap-$($(PKG)_VERSION)
+$(PKG)_FILE     := termcap-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := ftp://ftp.gnu.org/gnu/termcap/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package termcap.' >&2;
+    echo $(termcap_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && autoreconf
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        AR=$(TARGET)-ar
+
+    $(MAKE) AR=$(TARGET)-ar -C '$(1)' -j '$(JOBS)' install
+
+    if [ "$(BUILD_SHARED)" = yes ]; then \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libtermcap.a'; \
+      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libtermcap.dll.a' '$(PREFIX)/$(TARGET)/lib/libtermcap.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libtermcap.dll' '$(PREFIX)/$(TARGET)/bin/libtermcap.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libtermcap.dll'; \
+    fi
+endef