Revert "gnu: gtk+: Skip test that requires SVG support on non-x86_64." - guix


about summary refs log tree commit diff

path: root/ChangeLog

diff options

author	Ludovic Courtès <ludo@gnu.org>	2021-11-26 10:53:24 +0100
committer	Ludovic Courtès <ludo@gnu.org>	2021-11-26 10:53:24 +0100
commit	96d3c3eee85f3745da29fd9bd74846a53509f804 (patch)
tree	9695944322caa0be9e94a66985472ddd2953dda2 /ChangeLog
parent	a41aea131a9ade2e714cfdeb8de36c94d799606c (diff)
download	guix-96d3c3eee85f3745da29fd9bd74846a53509f804.tar.gz guix-96d3c3eee85f3745da29fd9bd74846a53509f804.zip

Revert "gnu: gtk+: Skip test that requires SVG support on non-x86_64."

This reverts commit fa35a5f649518a5c3e41aec796ee9b6b852d93c0, which is redundant with 8a8e491258adadcb6983a4051fa71e60c0dd7849.

Diffstat (limited to 'ChangeLog')

0 files changed, 0 insertions, 0 deletions

uot;, GUIX_OPT_BUILD_USERS_GROUP, n_("GROUP"), 0, n_("perform builds as a user of GROUP") }, { "no-substitutes", GUIX_OPT_NO_SUBSTITUTES, 0, 0, n_("do not use substitutes") }, { "substitute-urls", GUIX_OPT_SUBSTITUTE_URLS, n_("URLS"), 0, n_("use URLS as the default list of substitute providers") }, { "no-offload", GUIX_OPT_NO_BUILD_HOOK, 0, 0, n_("do not attempt to offload builds") }, { "no-build-hook", GUIX_OPT_NO_BUILD_HOOK, 0, OPTION_HIDDEN, // deprecated n_("do not attempt to offload builds") }, { "cache-failures", GUIX_OPT_CACHE_FAILURES, 0, 0, n_("cache build failures") }, { "rounds", GUIX_OPT_BUILD_ROUNDS, "N", 0, n_("build each derivation N times in a row") }, { "lose-logs", GUIX_OPT_LOSE_LOGS, 0, 0, n_("do not keep build logs") }, { "disable-log-compression", GUIX_OPT_DISABLE_LOG_COMPRESSION, 0, OPTION_HIDDEN, // deprecated n_("disable compression of the build logs") }, { "log-compression", GUIX_OPT_LOG_COMPRESSION, "TYPE", 0, n_("use the specified compression type for build logs") }, { "discover", GUIX_OPT_DISCOVER, "yes/no", OPTION_ARG_OPTIONAL, n_("use substitute servers discovered on the local network") }, /* '--disable-deduplication' was known as '--disable-store-optimization' up to Guix 0.7 included, so keep the alias around. */ { "disable-deduplication", GUIX_OPT_DISABLE_DEDUPLICATION, 0, 0, n_("disable automatic file \"deduplication\" in the store") }, { "disable-store-optimization", GUIX_OPT_DISABLE_DEDUPLICATION, 0, OPTION_ALIAS | OPTION_HIDDEN, NULL }, { "impersonate-linux-2.6", GUIX_OPT_IMPERSONATE_LINUX_26, 0, #ifdef HAVE_SYS_PERSONALITY_H 0, #else OPTION_HIDDEN, #endif n_("impersonate Linux 2.6") }, { "gc-keep-outputs", GUIX_OPT_GC_KEEP_OUTPUTS, "yes/no", OPTION_ARG_OPTIONAL, n_("tell whether the GC must keep outputs of live derivations") }, { "gc-keep-derivations", GUIX_OPT_GC_KEEP_DERIVATIONS, "yes/no", OPTION_ARG_OPTIONAL, n_("tell whether the GC must keep derivations corresponding \ to live outputs") }, { "listen", GUIX_OPT_LISTEN, n_("SOCKET"), 0, n_("listen for connections on SOCKET") }, { "debug", GUIX_OPT_DEBUG, 0, 0, n_("produce debugging output") }, { 0, 0, 0, 0, 0 } }; /* Default port for '--listen' on TCP/IP. */ #define DEFAULT_GUIX_PORT "44146" /* List of '--listen' options. */ static std::list<std::string> listen_options; static bool useDiscover = false; /* Convert ARG to a Boolean value, or throw an error if it does not denote a Boolean. */ static bool string_to_bool (const char *arg, bool dflt = true) { if (arg == NULL) return dflt; else if (strcasecmp (arg, "yes") == 0) return true; else if (strcasecmp (arg, "no") == 0) return false; else throw nix::Error (format ("'%1%': invalid Boolean value") % arg); } /* Parse a single option. */ static error_t parse_opt (int key, char *arg, struct argp_state *state) { switch (key) { case GUIX_OPT_DISABLE_CHROOT: settings.useChroot = false; break; case GUIX_OPT_CHROOT_DIR: { std::string chroot_dirs; chroot_dirs = settings.get ("build-extra-chroot-dirs", (std::string) ""); if (chroot_dirs == "") chroot_dirs = arg; else chroot_dirs = chroot_dirs + " " + arg; settings.set("build-extra-chroot-dirs", chroot_dirs); break; } case GUIX_OPT_LOG_COMPRESSION: if (strcmp (arg, "none") == 0) settings.logCompression = COMPRESSION_NONE; else if (strcmp (arg, "gzip") == 0) settings.logCompression = COMPRESSION_GZIP; #if HAVE_BZLIB_H else if (strcmp (arg, "bzip2") == 0) settings.logCompression = COMPRESSION_BZIP2; #endif else { fprintf (stderr, _("error: %s: unknown compression type\n"), arg); exit (EXIT_FAILURE); } break; case GUIX_OPT_DISABLE_LOG_COMPRESSION: settings.logCompression = COMPRESSION_NONE; break; case GUIX_OPT_BUILD_USERS_GROUP: settings.buildUsersGroup = arg; break; case GUIX_OPT_DISABLE_DEDUPLICATION: settings.autoOptimiseStore = false; break; case GUIX_OPT_CACHE_FAILURES: settings.cacheFailure = true; break; case GUIX_OPT_BUILD_ROUNDS: { char *end; unsigned long n = strtoul (arg, &end, 10); if (end != arg + strlen (arg)) { fprintf (stderr, _("error: %s: invalid number of rounds\n"), arg); exit (EXIT_FAILURE); } settings.set ("build-repeat", std::to_string (std::max (0UL, n - 1))); break; } case GUIX_OPT_IMPERSONATE_LINUX_26: settings.impersonateLinux26 = true; break; case GUIX_OPT_LOSE_LOGS: settings.keepLog = false; break; case GUIX_OPT_LISTEN: listen_options.push_back (arg); break; case GUIX_OPT_SUBSTITUTE_URLS: settings.set ("substitute-urls", arg); break; case GUIX_OPT_NO_SUBSTITUTES: settings.set ("build-use-substitutes", "false"); break; case GUIX_OPT_NO_BUILD_HOOK: settings.useBuildHook = false; break; case GUIX_OPT_DISCOVER: useDiscover = string_to_bool (arg); settings.set ("discover", useDiscover ? "true" : "false"); break; case GUIX_OPT_DEBUG: verbosity = lvlDebug; break; case GUIX_OPT_GC_KEEP_OUTPUTS: settings.gcKeepOutputs = string_to_bool (arg); break; case GUIX_OPT_GC_KEEP_DERIVATIONS: settings.gcKeepDerivations = string_to_bool (arg); break; case 'c': settings.set ("build-cores", arg); break; case 'M': settings.set ("build-max-jobs", arg); break; case GUIX_OPT_TIMEOUT: settings.set ("build-timeout", arg); break; case GUIX_OPT_MAX_SILENT_TIME: settings.set ("build-max-silent-time", arg); break; case GUIX_OPT_SYSTEM: settings.thisSystem = arg; break; default: return (error_t) ARGP_ERR_UNKNOWN; } return (error_t) 0; } /* Argument parsing. */ static const struct argp argp = { options, parse_opt, NULL, doc, NULL, NULL, // children and help_filter guix_textdomain }; static int open_unix_domain_socket (const char *file) { /* Create and bind to a Unix domain socket. */ AutoCloseFD fdSocket = socket (PF_UNIX, SOCK_STREAM, 0); if (fdSocket == -1) throw SysError (_("cannot create Unix domain socket")); createDirs (dirOf (file)); /* Urgh, sockaddr_un allows path names of only 108 characters. So chdir to the socket directory so that we can pass a relative path name. */ if (chdir (dirOf (file).c_str ()) == -1) throw SysError (_("cannot change current directory")); Path fileRel = "./" + baseNameOf (file); struct sockaddr_un addr; addr.sun_family = AF_UNIX; if (fileRel.size () >= sizeof (addr.sun_path)) throw Error (format (_("socket file name '%1%' is too long")) % fileRel); strcpy (addr.sun_path, fileRel.c_str ()); unlink (file); /* Make sure that the socket is created with 0666 permission (everybody can connect --- provided they have access to the directory containing the socket). */ mode_t oldMode = umask (0111); int res = bind (fdSocket, (struct sockaddr *) &addr, sizeof addr); umask (oldMode); if (res == -1) throw SysError (format (_("cannot bind to socket '%1%'")) % file); if (chdir ("/") == -1) /* back to the root */ throw SysError (_("cannot change current directory")); if (listen (fdSocket, 5) == -1) throw SysError (format (_("cannot listen on socket '%1%'")) % file); return fdSocket.borrow (); } /* Return a listening socket for ADDRESS, which has the given LENGTH. */ static int open_inet_socket (const struct sockaddr *address, socklen_t length) { AutoCloseFD fd = socket (address->sa_family, SOCK_STREAM, 0); if (fd == -1) throw SysError (_("cannot create TCP socket")); int res = bind (fd, address, length); if (res == -1) throw SysError (_("cannot bind TCP socket")); if (listen (fd, 5) == -1) throw SysError (format (_("cannot listen on TCP socket"))); return fd.borrow (); } /* Return a list of file descriptors of listening sockets. */ static std::vector<int> listening_sockets (const std::list<std::string> &options) { std::vector<int> result; if (options.empty ()) { /* Open the default Unix-domain socket. */ auto fd = open_unix_domain_socket (settings.nixDaemonSocketFile.c_str ()); result.push_back (fd); return result; } /* Open the user-specified sockets. */ for (const std::string& option: options) { if (option[0] == '/') { /* Assume OPTION is the file name of a Unix-domain socket. */ settings.nixDaemonSocketFile = canonPath (option); int fd = open_unix_domain_socket (settings.nixDaemonSocketFile.c_str ()); result.push_back (fd); } else { /* Assume OPTIONS has the form "HOST" or "HOST:PORT". */ auto colon = option.find_last_of (":"); auto host = colon == std::string::npos ? option : option.substr (0, colon); auto port = colon == std::string::npos ? DEFAULT_GUIX_PORT : option.substr (colon + 1, option.size () - colon - 1); struct addrinfo *res, hints; memset (&hints, '\0', sizeof hints); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; int err = getaddrinfo (host.c_str(), port.c_str (), &hints, &res); if (err != 0) throw Error(format ("failed to look up '%1%': %2%") % option % gai_strerror (err)); printMsg (lvlDebug, format ("listening on '%1%', port '%2%'") % host % port); /* XXX: Pick the first result, RES. */ result.push_back (open_inet_socket (res->ai_addr, res->ai_addrlen)); freeaddrinfo (res); } } return result; } /* First file descriptor provided at startup using systemd-style socket activation. */ #define SD_LISTEN_FDS_START 3 /* Return a list of file descriptors of listening sockets provided following the systemd "socket activation" protocol. Return the empty list if we are not being socket-activated. */ static std::vector<int> systemd_activation_sockets () { std::vector<int> result; if (getEnv ("LISTEN_PID") == std::to_string (getpid ())) { unsigned int fdCount; if (string2Int (getEnv ("LISTEN_FDS"), fdCount)) { for (unsigned int i = 0; i < fdCount; i++) result.push_back (SD_LISTEN_FDS_START + i); } } return result; } int main (int argc, char *argv[]) { setlocale (LC_ALL, ""); bindtextdomain (guix_textdomain, LOCALEDIR); textdomain (guix_textdomain); /* Initialize libgcrypt. */ if (!gcry_check_version (GCRYPT_VERSION)) { fprintf (stderr, _("error: libgcrypt version mismatch\n")); exit (EXIT_FAILURE); } /* Tell Libgcrypt that initialization has completed, as per the Libgcrypt 1.6.0 manual (although this does not appear to be strictly needed.) */ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); /* Set the umask so that the daemon does not end up creating group-writable files, which would lead to "suspicious ownership or permission" errors. See <http://lists.gnu.org/archive/html/bug-guix/2013-07/msg00033.html>. */ umask (S_IWGRP | S_IWOTH); #ifndef HAVE_CHROOT # error chroot is assumed to be available #endif /* Always use chroots by default. */ settings.useChroot = true; /* Turn automatic deduplication on by default. */ settings.autoOptimiseStore = true; /* Default to using as many cores as possible and one job at a time. */ settings.buildCores = 0; settings.maxBuildJobs = 1; argvSaved = argv; try { settings.processEnvironment (); /* Enable substitutes by default. */ settings.set ("build-use-substitutes", "true"); /* Use our substitute server by default. */ settings.set ("substitute-urls", GUIX_SUBSTITUTE_URLS); #ifdef HAVE_DAEMON_OFFLOAD_HOOK /* Use 'guix offload' for distributed builds by default. */ settings.useBuildHook = true; #else /* We are not installing any build hook, so disable it. */ settings.useBuildHook = false; #endif argp_parse (&argp, argc, argv, 0, 0, 0); auto sockets = systemd_activation_sockets (); if (sockets.empty ()) /* We were not "socket-activated" so open the sockets specified by LISTEN_OPTIONS. */ sockets = listening_sockets (listen_options); else printMsg (lvlInfo, format (ngettext ("socket-activated with %1% socket", "socket-activated with %1% sockets", sockets.size ())) % sockets.size ()); /* Effect all the changes made via 'settings.set'. */ settings.update (); printMsg(lvlDebug, format ("build log compression: %1%") % settings.logCompression); if (geteuid () == 0 && settings.buildUsersGroup.empty ()) fprintf (stderr, _("warning: daemon is running as root, so \ using `--build-users-group' is highly recommended\n")); if (settings.useChroot) { std::string chroot_dirs; chroot_dirs = settings.get ("build-extra-chroot-dirs", (std::string) ""); printMsg (lvlDebug, format ("extra chroot directories: '%1%'") % chroot_dirs); } if (useDiscover) { Strings args; args.push_back("guix"); args.push_back("discover"); startProcess([&]() { execv(settings.guixProgram.c_str(), stringsToCharPtrs(args).data()); }); } printMsg (lvlDebug, format ("automatic deduplication set to %1%") % settings.autoOptimiseStore); run (sockets); } catch (std::exception &e) { fprintf (stderr, _("error: %s\n"), e.what ()); return EXIT_FAILURE; } return EXIT_SUCCESS; /* never reached */ }


context:
space:
mode: