[gnunet] branch master updated: dht: only build IP underlay on linux, it is not portable right now

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 69fa660a8 dht: only build IP underlay on linux, it is not portable 
right now
69fa660a8 is described below

commit 69fa660a84654ea40651ddadef90238565be4bc1
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Nov 14 13:51:52 2024 +0100

    dht: only build IP underlay on linux, it is not portable right now
---
 src/service/dht/Makefile.am          | 10 ++++++++--
 src/service/dht/gnunet-service-dht.c |  4 ++++
 src/service/dht/meson.build          |  5 +++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/service/dht/Makefile.am b/src/service/dht/Makefile.am
index c45e09c83..cae23ac38 100644
--- a/src/service/dht/Makefile.am
+++ b/src/service/dht/Makefile.am
@@ -35,11 +35,17 @@ libgnunetdht_la_LDFLAGS = \
 libexec_PROGRAMS = \
  gnunet-service-dht
 
+UNDERLAY_PLUGINS = \
+  plugin_dhtu_gnunet.c plugin_dhtu_gnunet.h
+if LINUX
+UNDERLAY_PLUGINS += \
+ plugin_dhtu_ip.c plugin_dhtu_ip.h
+endif
+
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c gnunet-service-dht.h \
- plugin_dhtu_gnunet.h plugin_dhtu_ip.h \
- plugin_dhtu_gnunet.c plugin_dhtu_ip.c \
  dht_helper.c dht_helper.h \
+ $(UNDERLAY_PLUGINS)
  gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
  gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
  gnunet-service-dht_routing.c gnunet-service-dht_routing.h
diff --git a/src/service/dht/gnunet-service-dht.c 
b/src/service/dht/gnunet-service-dht.c
index 4579bfc2b..b6ac41750 100644
--- a/src/service/dht/gnunet-service-dht.c
+++ b/src/service/dht/gnunet-service-dht.c
@@ -385,10 +385,12 @@ shutdown_task (void *cls)
     {
       DHTU_gnunet_done (u->dhtu);
     }
+#ifdef LINUX
     else if (0 == strcmp (u->name, "ip"))
     {
       DHTU_ip_done (u->dhtu);
     }
+#endif
     else
     {
       GNUNET_assert (0);
@@ -464,10 +466,12 @@ load_underlay (void *cls,
   {
     u->dhtu = DHTU_gnunet_init (&u->env);
   }
+#ifdef LINUX
   else if (0 == strcmp (section, "ip"))
   {
     u->dhtu = DHTU_ip_init (&u->env);
   }
+#endif
   if (NULL == u->dhtu)
   {
     GNUNET_free (u);
diff --git a/src/service/dht/meson.build b/src/service/dht/meson.build
index b43117760..68f4c0e11 100644
--- a/src/service/dht/meson.build
+++ b/src/service/dht/meson.build
@@ -2,12 +2,13 @@ libgnunetdht_src = ['dht_api.c']
 
 gnunetservicedht_src = ['gnunet-service-dht.c',
                         'plugin_dhtu_gnunet.c',
-                        'plugin_dhtu_ip.c',
                         'dht_helper.c',
                         'gnunet-service-dht_datacache.c',
                         'gnunet-service-dht_neighbours.c',
                         'gnunet-service-dht_routing.c']
-
+if host_machine.system() == 'linux'
+  gnunetservicedht_src += 'plugin_dhtu_ip.c'
+endif
 configure_file(input : 'dht.conf.in',
                output : 'dht.conf',
                configuration : cdata,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.