From 6360611457a39292e11980bb522a14a5c9a58716 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 22 Oct 2017 22:44:42 -0700 Subject: Port to OpenIndiana Problem reported by Nelson H. F. Beebe (Bug#28893). Also see Bug#23748, Bug#9736, and Bug#5735. * configure.ac (tputs_library): Prefer libcurses to libtermcap, since OpenIndiana libtermcap lacks tparm. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 63324c2c7c9..8d14115c490 100644 --- a/configure.ac +++ b/configure.ac @@ -4035,7 +4035,7 @@ AC_CACHE_CHECK([for library containing tputs], [emacs_cv_tputs_lib], else # Maybe curses should be tried earlier? # See https://debbugs.gnu.org/9736#35 - for tputs_library in '' tinfo ncurses terminfo termcap curses; do + for tputs_library in '' tinfo ncurses terminfo curses termcap; do OLIBS=$LIBS if test -z "$tputs_library"; then emacs_cv_tputs_lib='none required' -- cgit v1.2.1 From 19667f44efabda7d4e53e706c6cd8140145b2a1a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 24 Oct 2017 11:46:30 -0700 Subject: * configure.ac: Tweak libcurses diagnostic. --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8d14115c490..646a637cf34 100644 --- a/configure.ac +++ b/configure.ac @@ -4033,8 +4033,7 @@ AC_CACHE_CHECK([for library containing tputs], [emacs_cv_tputs_lib], [if test "${opsys}" = "mingw32"; then emacs_cv_tputs_lib='none required' else - # Maybe curses should be tried earlier? - # See https://debbugs.gnu.org/9736#35 + # curses precedes termcap because of AIX (Bug#9736#35) and OpenIndiana. for tputs_library in '' tinfo ncurses terminfo curses termcap; do OLIBS=$LIBS if test -z "$tputs_library"; then @@ -4054,7 +4053,7 @@ fi]) AS_CASE(["$emacs_cv_tputs_lib"], [no], [AC_MSG_ERROR([The required function 'tputs' was not found in any library. The following libraries were tried (in order): - libtinfo, libncurses, libterminfo, libtermcap, libcurses + libtinfo, libncurses, libterminfo, libcurses, libtermcap Please try installing whichever of these libraries is most appropriate for your system, together with its header files. For example, a libncurses-dev(el) or similar package.])], -- cgit v1.2.1 From 1d83257a1db3a9b87675a0dfc68cb4964cecaa09 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 24 Oct 2017 12:54:28 -0700 Subject: Port to QNX Simplified version of a patch proposed by Elad Lahav in: https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00716.html which is based on a previous patch I proposed in: https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00707.html * configure.ac (opsys, CFLAGS, LIBS_SYSTEM, hybrid_malloc) (system_alloc, FIRST_PTY_LETTER, CYGWIN_OBJ): Set appropriately for QNX. * src/unexelf.c [__QNX__]: Include instead of . (unexec): Check for sbrk failure, and fall back on old BSS end. --- configure.ac | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 646a637cf34..ca75136474e 100644 --- a/configure.ac +++ b/configure.ac @@ -699,6 +699,12 @@ case "${canonical}" in esac ;; + ## QNX Neutrino + *-nto-qnx* ) + opsys=qnxnto + CFLAGS="$CFLAGS -D__NO_EXT_QNX" + ;; + ## Intel 386 machines where we don't care about the manufacturer. i[3456]86-*-* ) case "${canonical}" in @@ -1507,6 +1513,8 @@ case "$opsys" in hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; + qnxnto) LIBS_SYSTEM="-lsocket" ;; + sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;; ## Motif needs -lgen. @@ -2210,7 +2218,8 @@ test "$CANNOT_DUMP" = yes || case "$opsys" in ## darwin ld insists on the use of malloc routines in the System framework. darwin | mingw32 | nacl | sol2-10) ;; - cygwin) hybrid_malloc=yes + cygwin | qnxto) + hybrid_malloc=yes system_malloc= ;; *) test "$ac_cv_func_sbrk" = yes && system_malloc=$emacs_cv_sanitize_address;; esac @@ -4603,7 +4612,7 @@ case $opsys in AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) ;; - gnu | openbsd ) + gnu | openbsd | qnxnto ) AC_DEFINE(FIRST_PTY_LETTER, ['p']) ;; @@ -5144,6 +5153,8 @@ elif test "$opsys" = "mingw32"; then CYGWIN_OBJ= PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o +elif test "$opsys" = "qnxnto"; then + CYGWIN_OBJ=sheap.o else CYGWIN_OBJ= PRE_ALLOC_OBJ=lastfile.o -- cgit v1.2.1 From 685fd779592db0019b8489a06d72ec4bebef3c9a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 25 Oct 2017 20:47:48 -0700 Subject: Fix duplicate .o file on QNX * configure.ac (CYGWIN_OBJ): Leave empty on QNX. Problem reported by Elad Lahav in: https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00750.html --- configure.ac | 2 -- 1 file changed, 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ca75136474e..d397e8fa7e1 100644 --- a/configure.ac +++ b/configure.ac @@ -5153,8 +5153,6 @@ elif test "$opsys" = "mingw32"; then CYGWIN_OBJ= PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o -elif test "$opsys" = "qnxnto"; then - CYGWIN_OBJ=sheap.o else CYGWIN_OBJ= PRE_ALLOC_OBJ=lastfile.o -- cgit v1.2.1