builder-module: Add wrap-mode=nodownload to meson if building w/o network

Supersedes #643

Author: bbhtt

src/builder-module.c

@@ -1754,6 +1754,7 @@ builder_module_build_helper (BuilderModule   *self,
   const char *ldflags = NULL;
 
   gboolean autotools = FALSE, cmake = FALSE, cmake_ninja = FALSE, meson = FALSE, simple = FALSE, qmake = FALSE;
+  gboolean build_has_network = FALSE;
   g_autoptr(GFile) configure_file = NULL;
   g_autoptr(GFile) build_dir = NULL;
   g_autofree char *build_dir_relative = NULL;
@@ -1796,6 +1797,8 @@ builder_module_build_helper (BuilderModule   *self,
   if (build_args == NULL)
     return FALSE;
 
+  build_has_network = builder_options_build_has_network (build_args);
+
   env = builder_options_get_env (self->build_options, context);
   cflags  = g_environ_getenv (env, "CFLAGS");
   cxxflags = g_environ_getenv (env, "CXXFLAGS");
@@ -2020,6 +2023,8 @@ builder_module_build_helper (BuilderModule   *self,
         {
           /* Meson's setup command is now meson setup */
           g_ptr_array_add (configure_args_arr, g_strdup ("setup"));
+          if (!build_has_network)
+            g_ptr_array_add (configure_args_arr, g_strdup ("--wrap-mode=nodownload"));
         }
 
       if (cmake || cmake_ninja)

src/builder-options.c

@@ -1236,6 +1236,36 @@ builder_options_get_build_args (BuilderOptions *self,
   return (char **) g_ptr_array_free (g_steal_pointer (&array), FALSE);
 }
 
+gboolean
+builder_options_build_has_network (char **build_args)
+{
+  gboolean has_network = FALSE;
+
+  if (!build_args)
+    return FALSE;
+
+  /*
+   * The last arg passed to flatpak build wins:
+   *
+   *   --unshare=network --share=network  -> network enabled
+   *   --share=network --unshare=network  -> network disabled
+   *
+   * So we iterate through the entire list
+   */
+
+  for (size_t i = 0; build_args[i]; i++)
+    {
+      const char *arg = build_args[i];
+
+      if (g_strcmp0 (arg, "--unshare=network") == 0)
+        has_network = FALSE;
+      else if (g_strcmp0 (arg, "--share=network") == 0)
+        has_network = TRUE;
+    }
+
+  return has_network;
+}
+
 char **
 builder_options_get_test_args (BuilderOptions *self,
                                BuilderContext *context,

src/builder-options.h

@@ -81,6 +81,7 @@ gboolean    builder_options_get_no_debuginfo_compression (BuilderOptions *self,
 							  BuilderContext *context);
 gboolean    builder_options_get_strip (BuilderOptions *self,
                                        BuilderContext *context);
+gboolean builder_options_build_has_network (char **build_args);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (BuilderOptions, g_object_unref)