* [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1
@ 2021-11-15 22:18 Fabrice Fontaine
2021-11-16 20:32 ` Arnout Vandecappelle
2021-12-11 9:58 ` Arnout Vandecappelle
0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-11-15 22:18 UTC (permalink / raw)
To: buildroot; +Cc: Koen Martens, Fabrice Fontaine
- Drop patch (already in version)
- Fix build on musl by disabling fibers through the new KJ_USE_FIBERS
variable:
https://github.com/capnproto/capnproto/issues/1167
https://github.com/capnproto/capnproto/pull/1313
- Update indentation in hash file (two spaces)
https://capnproto.org/news
Fixes:
- http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...it-architectures-using-64-bit-time_t.patch | 37 -------------------
package/capnproto/capnproto.hash | 4 +-
package/capnproto/capnproto.mk | 7 +++-
3 files changed, 8 insertions(+), 40 deletions(-)
delete mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
deleted file mode 100644
index ce70ab8f29..0000000000
--- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 15 Nov 2020 12:10:28 -0800
-Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t
-
-mutex code uses SYS_futex, which it expects from system C library.
-in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
-rv32 is using 64bit time_t from get go unlike other 32bit architectures
-in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
-this aliases it to NR_futex so that SYS_futex is then defined for rv32
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Retrieved from:
-https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- c++/src/kj/mutex.c++ | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++
-index c81cead7b..e1594b117 100644
---- a/c++/src/kj/mutex.c++
-+++ b/c++/src/kj/mutex.c++
-@@ -39,7 +39,13 @@
-
- #ifndef SYS_futex
- // Missing on Android/Bionic.
-+#ifdef __NR_futex
- #define SYS_futex __NR_futex
-+#elif defined(SYS_futex_time64)
-+#define SYS_futex SYS_futex_time64
-+#else
-+#error "Need working SYS_futex"
-+#endif
- #endif
-
- #ifndef FUTEX_WAIT_PRIVATE
diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash
index d4500e0aad..7fd0e6158b 100644
--- a/package/capnproto/capnproto.hash
+++ b/package/capnproto/capnproto.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz
-sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE
+sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz
+sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE
diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk
index 901b57ecda..7fc07043fb 100644
--- a/package/capnproto/capnproto.mk
+++ b/package/capnproto/capnproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CAPNPROTO_VERSION = 0.8.0
+CAPNPROTO_VERSION = 0.9.1
CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
CAPNPROTO_LICENSE = MIT
CAPNPROTO_LICENSE_FILES = LICENSE
@@ -29,5 +29,10 @@ else
CAPNPROTO_CONF_OPTS += --without-openssl
endif
+# musl doesn't support getcontext/setcontext
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0"
+endif
+
$(eval $(autotools-package))
$(eval $(host-autotools-package))
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1
2021-11-15 22:18 [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1 Fabrice Fontaine
@ 2021-11-16 20:32 ` Arnout Vandecappelle
2021-12-11 9:58 ` Arnout Vandecappelle
1 sibling, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-11-16 20:32 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Koen Martens
On 15/11/2021 23:18, Fabrice Fontaine wrote:
> - Drop patch (already in version)
> - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS
> variable:
> https://github.com/capnproto/capnproto/issues/1167
> https://github.com/capnproto/capnproto/pull/1313
Since we also need to fix this for 2021.08.x, and since we're in the
stabilisation period now, we should backport these patches rather than bumping.
Regards,
Arnout
> - Update indentation in hash file (two spaces)
>
> https://capnproto.org/news
>
> Fixes:
> - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...it-architectures-using-64-bit-time_t.patch | 37 -------------------
> package/capnproto/capnproto.hash | 4 +-
> package/capnproto/capnproto.mk | 7 +++-
> 3 files changed, 8 insertions(+), 40 deletions(-)
> delete mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
>
> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
> deleted file mode 100644
> index ce70ab8f29..0000000000
> --- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 15 Nov 2020 12:10:28 -0800
> -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t
> -
> -mutex code uses SYS_futex, which it expects from system C library.
> -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
> -rv32 is using 64bit time_t from get go unlike other 32bit architectures
> -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
> -this aliases it to NR_futex so that SYS_futex is then defined for rv32
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -[Retrieved from:
> -https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - c++/src/kj/mutex.c++ | 6 ++++++
> - 1 file changed, 6 insertions(+)
> -
> -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++
> -index c81cead7b..e1594b117 100644
> ---- a/c++/src/kj/mutex.c++
> -+++ b/c++/src/kj/mutex.c++
> -@@ -39,7 +39,13 @@
> -
> - #ifndef SYS_futex
> - // Missing on Android/Bionic.
> -+#ifdef __NR_futex
> - #define SYS_futex __NR_futex
> -+#elif defined(SYS_futex_time64)
> -+#define SYS_futex SYS_futex_time64
> -+#else
> -+#error "Need working SYS_futex"
> -+#endif
> - #endif
> -
> - #ifndef FUTEX_WAIT_PRIVATE
> diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash
> index d4500e0aad..7fd0e6158b 100644
> --- a/package/capnproto/capnproto.hash
> +++ b/package/capnproto/capnproto.hash
> @@ -1,3 +1,3 @@
> # Locally calculated
> -sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz
> -sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE
> +sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz
> +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE
> diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk
> index 901b57ecda..7fc07043fb 100644
> --- a/package/capnproto/capnproto.mk
> +++ b/package/capnproto/capnproto.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -CAPNPROTO_VERSION = 0.8.0
> +CAPNPROTO_VERSION = 0.9.1
> CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
> CAPNPROTO_LICENSE = MIT
> CAPNPROTO_LICENSE_FILES = LICENSE
> @@ -29,5 +29,10 @@ else
> CAPNPROTO_CONF_OPTS += --without-openssl
> endif
>
> +# musl doesn't support getcontext/setcontext
> +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
> +CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0"
> +endif
> +
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1
2021-11-15 22:18 [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1 Fabrice Fontaine
2021-11-16 20:32 ` Arnout Vandecappelle
@ 2021-12-11 9:58 ` Arnout Vandecappelle
2022-01-14 16:14 ` Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-12-11 9:58 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Koen Martens
On 15/11/2021 23:18, Fabrice Fontaine wrote:
> - Drop patch (already in version)
> - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS
> variable:
> https://github.com/capnproto/capnproto/issues/1167
> https://github.com/capnproto/capnproto/pull/1313
> - Update indentation in hash file (two spaces)
>
> https://capnproto.org/news
>
> Fixes:
> - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53
I've applied to master now, but hte build error of course still exists on the
2021.11 branch.
Regards,
Arnout
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...it-architectures-using-64-bit-time_t.patch | 37 -------------------
> package/capnproto/capnproto.hash | 4 +-
> package/capnproto/capnproto.mk | 7 +++-
> 3 files changed, 8 insertions(+), 40 deletions(-)
> delete mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
>
> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
> deleted file mode 100644
> index ce70ab8f29..0000000000
> --- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 15 Nov 2020 12:10:28 -0800
> -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t
> -
> -mutex code uses SYS_futex, which it expects from system C library.
> -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
> -rv32 is using 64bit time_t from get go unlike other 32bit architectures
> -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
> -this aliases it to NR_futex so that SYS_futex is then defined for rv32
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -[Retrieved from:
> -https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - c++/src/kj/mutex.c++ | 6 ++++++
> - 1 file changed, 6 insertions(+)
> -
> -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++
> -index c81cead7b..e1594b117 100644
> ---- a/c++/src/kj/mutex.c++
> -+++ b/c++/src/kj/mutex.c++
> -@@ -39,7 +39,13 @@
> -
> - #ifndef SYS_futex
> - // Missing on Android/Bionic.
> -+#ifdef __NR_futex
> - #define SYS_futex __NR_futex
> -+#elif defined(SYS_futex_time64)
> -+#define SYS_futex SYS_futex_time64
> -+#else
> -+#error "Need working SYS_futex"
> -+#endif
> - #endif
> -
> - #ifndef FUTEX_WAIT_PRIVATE
> diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash
> index d4500e0aad..7fd0e6158b 100644
> --- a/package/capnproto/capnproto.hash
> +++ b/package/capnproto/capnproto.hash
> @@ -1,3 +1,3 @@
> # Locally calculated
> -sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz
> -sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE
> +sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz
> +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE
> diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk
> index 901b57ecda..7fc07043fb 100644
> --- a/package/capnproto/capnproto.mk
> +++ b/package/capnproto/capnproto.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -CAPNPROTO_VERSION = 0.8.0
> +CAPNPROTO_VERSION = 0.9.1
> CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
> CAPNPROTO_LICENSE = MIT
> CAPNPROTO_LICENSE_FILES = LICENSE
> @@ -29,5 +29,10 @@ else
> CAPNPROTO_CONF_OPTS += --without-openssl
> endif
>
> +# musl doesn't support getcontext/setcontext
> +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
> +CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0"
> +endif
> +
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1
2021-12-11 9:58 ` Arnout Vandecappelle
@ 2022-01-14 16:14 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2022-01-14 16:14 UTC (permalink / raw)
To: Arnout Vandecappelle; +Cc: Koen Martens, Fabrice Fontaine, buildroot
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> On 15/11/2021 23:18, Fabrice Fontaine wrote:
>> - Drop patch (already in version)
>> - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS
>> variable:
>> https://github.com/capnproto/capnproto/issues/1167
>> https://github.com/capnproto/capnproto/pull/1313
>> - Update indentation in hash file (two spaces)
>>
>> https://capnproto.org/news
>>
>> Fixes:
>> - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53
> I've applied to master now, but hte build error of course still
> exists on the 2021.11 branch.
And 2021.02.x.
Committed to 2021.02.x and 2021.11.x to fix that, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-14 16:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-15 22:18 [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1 Fabrice Fontaine
2021-11-16 20:32 ` Arnout Vandecappelle
2021-12-11 9:58 ` Arnout Vandecappelle
2022-01-14 16:14 ` 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.