Re: master 9076a63 1/3: Port to Solaris 10

Re: master 9076a63 1/3: Port to Solaris 10

[Andrea Corallo via Emacs development discussions.]

eggert@cs.ucla.edu (Paul Eggert) writes:

> branch: master
> commit 9076a631fe331763414a5d323496846d563ccaa0
> Author: Paul Eggert <eggert@cs.ucla.edu>
> Commit: Paul Eggert <eggert@cs.ucla.edu>
>
>     Port to Solaris 10
>     
>     * configure.ac: Instead of AC_CHECK_HEADER, use AC_COMPILE_IFELSE
>     with X11/Intrinsic.h when checking for X11/extensions/Xrender.h.
>     This suppresses a bogus "report a bug to bug-gnu-emacs" diagnostic
>     from 'configure' in Solaris 10.
>     (SETUP_SLAVE_PTY): Adjust to recent renaming of forkin to
>     std_in in callproc.c.  Needed on Solaris and Unixware.
>     * lib-src/Makefile.in (LIB_GETRANDOM, LIBS_ETAGS): New vars,
>     needed because on Solaris 10 the Gnulib tempname module now needs
>     the -lrt library for clock_gettime.  Throw in the LIB_GETRANDOM
>     stuff too while we’re at it; from getrandom.m4 it seems to be
>     needed for MingW.
>     (LIBS_MOVE, etags_libs): Use them.
>     * src/callproc.c [SETUP_SLAVE_PTY]: Include sys/stream.h
>     and sys/stropts.h, for SETUP_SLAVE_PTY’s definiens.
>     * src/process.c [NEED_BSDTTY]: Don’t include bsdtty.h; hasn’t been
>     needed in years.
>     [USG5_4]: Don’t include sys/stream.h or sys/stropts.h; these
>     directives havbe been moved to callproc.c because the only use of
>     SETUP_SLAVE_PTY is there now.
> ---
>  configure.ac        | 9 +++++++--
>  lib-src/Makefile.in | 9 +++++++--
>  src/callproc.c      | 5 +++++
>  src/process.c       | 9 ---------
>  4 files changed, 19 insertions(+), 13 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 574024a..5f822fe 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -3291,7 +3291,12 @@ fi
>  # Check for XRender
>  HAVE_XRENDER=no
>  if test "${HAVE_X11}" = "yes"; then
> -  AC_CHECK_HEADER([X11/extensions/Xrender.h],
> +  AC_COMPILE_IFELSE(
> +    [AC_LANG_PROGRAM(
> +       [[#include <X11/Intrinsic.h>
> +	 #include <X11/extensions/Xrender.h>
> +       ]],
> +       [[return !XRenderQueryExtension;]])],
>      [AC_CHECK_LIB([Xrender], [XRenderQueryExtension], [HAVE_XRENDER=yes])])
>    if test $HAVE_XRENDER = yes; then
>      XRENDER_LIBS="-lXrender"
> @@ -4926,7 +4931,7 @@ case $opsys in

Master does not build for me on Ubuntu 18.04.3, I think is because of
the above hunk.

This is the error:

========
  CCLD     temacs
/usr/bin/ld: xterm.o: undefined reference to symbol 'XRenderQueryExtension'
//usr/lib/x86_64-linux-gnu/libXrender.so.1: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
Makefile:655: recipe for target 'temacs' failed
========

We don't add -lXrender.  I do have "X11/extensions/Xrender.h" but not
"X11/Intrinsic.h".

  Andrea

Re: master 9076a63 1/3: Port to Solaris 10

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

On 1/4/21 8:08 AM, Andrea Corallo wrote:
>    CCLD     temacs
> /usr/bin/ld: xterm.o: undefined reference to symbol 'XRenderQueryExtension'
> //usr/lib/x86_64-linux-gnu/libXrender.so.1: error adding symbols: DSO missing from command line
> collect2: error: ld returned 1 exit status
> Makefile:655: recipe for target 'temacs' failed
> ========
> 
> We don't add -lXrender.  I do have "X11/extensions/Xrender.h" but not
> "X11/Intrinsic.h".

Isn't it odd to have the development environment for X11 extensions 
installed, but not that for base X11?

Still, Emacs should work if Xrender is absent while Cairo is present. I 
installed the attached patch to try to do that; please let us know if it 
works for you.

[-- Attachment #2: 0001-Do-not-assume-Xrender-merely-because-Cairo.patch --]
[-- Type: text/x-patch, Size: 1211 bytes --]

From ec35298e7f12d5aa86b79bcf5a6517ecc7414d74 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 4 Jan 2021 10:33:43 -0800
Subject: [PATCH] Do not assume Xrender merely because Cairo

Problem reported by Andrea Corallo in:
https://lists.gnu.org/r/emacs-devel/2021-01/msg00225.html
* src/xterm.c (x_term_init) [USE_CAIRO && !HAVE_XRENDER]:
Do not call XRenderQueryExtension.
---
 src/xterm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 0a86738cc2..b8374fed8b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13035,13 +13035,13 @@ #define NUM_ARGV 10
        or larger than other for other applications, even if it is the same
        font name (monospace-10 for example).  */
 
+# ifdef HAVE_XRENDER
     int event_base, error_base;
-    char *v;
-    double d;
-
     XRenderQueryExtension (dpyinfo->display, &event_base, &error_base);
+# endif
 
-    v = XGetDefault (dpyinfo->display, "Xft", "dpi");
+    char *v = XGetDefault (dpyinfo->display, "Xft", "dpi");
+    double d;
     if (v != NULL && sscanf (v, "%lf", &d) == 1)
       dpyinfo->resy = dpyinfo->resx = d;
   }
-- 
2.27.0

Re: master 9076a63 1/3: Port to Solaris 10

[Andrea Corallo via Emacs development discussions.]

Paul Eggert <eggert@cs.ucla.edu> writes:

> On 1/4/21 8:08 AM, Andrea Corallo wrote:
>>    CCLD     temacs
>> /usr/bin/ld: xterm.o: undefined reference to symbol 'XRenderQueryExtension'
>> //usr/lib/x86_64-linux-gnu/libXrender.so.1: error adding symbols: DSO missing from command line
>> collect2: error: ld returned 1 exit status
>> Makefile:655: recipe for target 'temacs' failed
>> ========
>> We don't add -lXrender.  I do have "X11/extensions/Xrender.h" but
>> not
>> "X11/Intrinsic.h".
>
> Isn't it odd to have the development environment for X11 extensions
> installed, but not that for base X11?

Hi Paul,

yes probably, I've no memory on why this machine is configured this way.

> Still, Emacs should work if Xrender is absent while Cairo is
> present. I installed the attached patch to try to do that; please let
> us know if it works for you.

Works for me, thanks for the quick fix!

Regards

  Andrea