* [Buildroot] [PATCH 1/2] package/slirp: switch official tarball
@ 2020-11-11 10:11 Fabrice Fontaine
2020-11-11 10:11 ` [Buildroot] [PATCH 2/2] package/slirp: add libglib2 mandatory dependency Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2020-11-11 10:11 UTC (permalink / raw)
To: buildroot
Other "official" tarballs don't ship .tarball-version resulting in a build
failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24
Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/slirp/slirp.hash | 2 +-
package/slirp/slirp.mk | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/slirp/slirp.hash b/package/slirp/slirp.hash
index 3051179df9..fe295b3bfb 100644
--- a/package/slirp/slirp.hash
+++ b/package/slirp/slirp.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 6b1641f04d41bc45f94018ac8d42d3c9f3ba0e463cbeacf5f26fe83fc050161e libslirp-v4.3.1.tar.bz2
+sha256 388b4b08a8cc0996cc5155cb027a097dc1a7f2cfe84b1121496608ab5366cc48 libslirp-4.3.1.tar.xz
sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index 4351818952..d046e0cf75 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -5,9 +5,10 @@
################################################################################
SLIRP_VERSION = 4.3.1
-SLIRP_SOURCE = libslirp-v$(SLIRP_VERSION).tar.bz2
-SLIRP_SITE = \
- https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$(SLIRP_VERSION)
+SLIRP_SOURCE = libslirp-$(SLIRP_VERSION).tar.xz
+# Other "official" tarballs don't ship .tarball-version resulting in a build
+# failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24
+SLIRP_SITE = https://elmarco.fedorapeople.org
SLIRP_LICENSE = BSD-3-Clause
SLIRP_LICENSE_FILES = COPYRIGHT
SLIRP_INSTALL_STAGING = YES
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] package/slirp: add libglib2 mandatory dependency
2020-11-11 10:11 [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Fabrice Fontaine
@ 2020-11-11 10:11 ` Fabrice Fontaine
2020-11-11 10:47 ` Peter Korsgaard
2020-11-14 10:30 ` Peter Korsgaard
2020-11-11 10:47 ` [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Peter Korsgaard
2020-11-14 10:30 ` Peter Korsgaard
2 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2020-11-11 10:11 UTC (permalink / raw)
To: buildroot
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>
---
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))
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/slirp: switch official tarball
2020-11-11 10:11 [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Fabrice Fontaine
2020-11-11 10:11 ` [Buildroot] [PATCH 2/2] package/slirp: add libglib2 mandatory dependency Fabrice Fontaine
@ 2020-11-11 10:47 ` Peter Korsgaard
2020-11-14 10:30 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-11-11 10:47 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Other "official" tarballs don't ship .tarball-version resulting in a build
> failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24
> Fixes:
> - http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f
:/
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/slirp: switch official tarball
2020-11-11 10:11 [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Fabrice Fontaine
2020-11-11 10:11 ` [Buildroot] [PATCH 2/2] package/slirp: add libglib2 mandatory dependency Fabrice Fontaine
2020-11-11 10:47 ` [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Peter Korsgaard
@ 2020-11-14 10:30 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-11-14 10:30 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Other "official" tarballs don't ship .tarball-version resulting in a build
> failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24
> Fixes:
> - http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.02.x and 2020.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-14 10:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-11 10:11 [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Fabrice Fontaine
2020-11-11 10:11 ` [Buildroot] [PATCH 2/2] package/slirp: add libglib2 mandatory dependency Fabrice Fontaine
2020-11-11 10:47 ` Peter Korsgaard
2020-11-14 10:30 ` Peter Korsgaard
2020-11-11 10:47 ` [Buildroot] [PATCH 1/2] package/slirp: switch official tarball Peter Korsgaard
2020-11-14 10:30 ` Peter Korsgaard
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.