All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit branch/next] package/slirp: add libglib2 mandatory dependency
Date: Wed, 11 Nov 2020 11:47:19 +0100	[thread overview]
Message-ID: <20201117203827.EA0AC7FB0D@busybox.osuosl.org> (raw)

commit: https://git.buildroot.net/buildroot/commit/?id=88a62fac1f659ccf00030e59e2a0720a9f346edf
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next

slirp depends on libglib2, don't update xen as it already depends on it

Fixes:
 - http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/slirp/Config.in | 8 ++++++++
 package/slirp/slirp.mk  | 1 +
 2 files changed, 9 insertions(+)

diff --git a/package/slirp/Config.in b/package/slirp/Config.in
index 8f57c4fa6a..38fd5277af 100644
--- a/package/slirp/Config.in
+++ b/package/slirp/Config.in
@@ -1,5 +1,9 @@
 config BR2_PACKAGE_SLIRP
 	bool "slirp"
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  libslirp is a user-mode networking library used by virtual
 	  machines, containers or various tools.
@@ -18,3 +22,7 @@ config BR2_PACKAGE_SLIRP
 	      around May 2009 which archived it in 2012
 	    - So we switched to
 	      https://gitlab.freedesktop.org/slirp/libslirp
+
+comment "slirp needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index d046e0cf75..ed6d8855e5 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -12,5 +12,6 @@ SLIRP_SITE = https://elmarco.fedorapeople.org
 SLIRP_LICENSE = BSD-3-Clause
 SLIRP_LICENSE_FILES = COPYRIGHT
 SLIRP_INSTALL_STAGING = YES
+SLIRP_DEPENDENCIES = libglib2
 
 $(eval $(meson-package))

                 reply	other threads:[~2020-11-11 10:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201117203827.EA0AC7FB0D@busybox.osuosl.org \
    --to=peter@korsgaard.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.