Re: [PATCH] meson: Add configuration of listening on tcp, unix and local

[Aaron Plattner]

On 06/26/2018 06:12 PM, Peter Hutterer wrote:

On Tue, Jun 26, 2018 at 01:07:23PM -0700, Aaron Plattner wrote:

On 06/24/2018 11:45 PM, Laurent Carlier wrote:

Le samedi 16 juin 2018, 13:00:01 CEST Laurent Carlier a écrit :

bugzilla: https://bugs.kde.org/show_bug.cgi?id=395419
bugzilla: https://bugs.archlinux.org/task/59025

Signed-off-by: Laurent Carlier <lordhea...@gmail.com>

Seems to work, so
Reviewed-by: Aaron Plattner <aplatt...@nvidia.com>

This switches the defined version from
#define LISTEN_TCP 1
to
#define LISTEN_TCP
but it's only used in an #ifndef so that's probably fine.

best to change to meson's conf_data.set10() then to keep the exact
functionality.

No, that's worse. Then "meson -Dlisten_tcp=false" does this:

#define LISTEN_TCP 0

which will enable TCP. Thanks, 1989 C preprocessor.

-- Aaron

Cheers,
    Peter

---
  include/meson.build | 6 +++---
  meson_options.txt   | 7 +++++++
  2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index f76f557..dfca3c3 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -153,10 +153,10 @@ conf_data.set('BUSFAULT',
conf_data.get('HAVE_SIGACTION')) conf_data.set('_XTYPEDEF_POINTER', '1')
  conf_data.set('_XITYPEDEF_POINTER', '1')

+conf_data.set('LISTEN_TCP', get_option('listen_tcp'))
+conf_data.set('LISTEN_UNIX', get_option('listen_unix'))
+conf_data.set('LISTEN_LOCAL', get_option('listen_local'))
  # XXX: Configurable?
-conf_data.set('LISTEN_TCP', '1')
-conf_data.set('LISTEN_UNIX', '1')
-conf_data.set('LISTEN_LOCAL', '1')
  conf_data.set('XTRANS_SEND_FDS', '1')

  conf_data.set('TCPCONN', '1')
diff --git a/meson_options.txt b/meson_options.txt
index 86fca46..3453b8d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -45,6 +45,13 @@ option('vendor_name_short', type: 'string', value:
'X.Org') option('vendor_web', type: 'string', value: 'http://wiki.x.org')
  option('os_vendor', type: 'string', value: '')

+option('listen_tcp', type: 'boolean', value: false,
+       description: 'Listen on TCP by default')
+option('listen_unix', type: 'boolean', value: true,
+       description: 'Listen on Unix by default')
+option('listen_local', type: 'boolean', value: true,
+       description: 'Listen on local by default')
+
  option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto',
'false'], value: 'auto',
         description: 'Xorg int10 backend (default: usually x86emu)')

Humble ping ?



_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel